r20059 - /packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Wed May 20 16:28:51 UTC 2009
Author: sjoerd
Date: Wed May 20 16:28:51 2009
New Revision: 20059
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20059
Log:
Actually commit the right patch, doh
Modified:
packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch
Modified: packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch?rev=20059&op=diff
==============================================================================
--- packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch (original)
+++ packages/unstable/loudmouth/debian/patches/02-fix-async-resolving.patch Wed May 20 16:28:51 2009
@@ -1,1 +1,42 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4xEE8fSMobWWjMsT1yOsxjwNNQX76ukzFkH+lNvsT7oSk1/QvJ8dt22QlOs1T38RYdFXyp7SCYKkZTadWwIIDOSfN2Mu3bGl+oUW0k++jC44NtpthM4a5R25g6IfN6NpJWFJYIL+rT2l+3V35skzyfTish93BxgtA97DEvmzDy2vwP6U22KWgUcdpunNFl1hc5Ei5iuvslOtjhBKDRg4wveNqUxtatJkafCSaVAPzd9Ye47IVzSbZoSuS0xHggPk2uQ66YzEVFi5ugeiYRoD78yBtbwMktZaX79d2ThmgdjHY0V7rr0r1szNTJNW4qFuRNTTf8bhDZdUrnmK/V2B9w== novo at wakko
+commit fc21de5fd06bee1714d38f92c60a2af75a7b5c29
+Author: Senko Rasic <senko.rasic at collabora.co.uk>
+Date: Sun Nov 30 10:20:08 2008 +0100
+
+ Don't check for sync dns problems when using asyncns [#33]
+
+ lm_socket_create() checks for sync DNS failure, but the check is
+ executed even if Loudmouth is using asyncns, in which case Loudmouth
+ crashes.
+
+diff --git a/loudmouth/lm-socket.c b/loudmouth/lm-socket.c
+index 63ef84f..8add572 100644
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -1022,7 +1022,7 @@ _lm_socket_create_phase2 (LmSocket *socket, struct addrinfo *ans)
+ if (socket->connect_func) {
+ (socket->connect_func) (socket, FALSE, socket->user_data);
+ }
+- g_free (socket->connect_data);
++ g_free (socket->connect_data);
+ socket->connect_data = NULL;
+ return;
+ }
+@@ -1107,6 +1107,10 @@ lm_socket_create (GMainContext *context,
+ _lm_socket_create_phase1 (socket, NULL, 0);
+ }
+
++#ifndef HAVE_ASYNCNS
++ /* Only do this check if we are not using asyncns or it will crash.
++ * Report and patch by Senko.
++ */
+ if (socket->connect_data == NULL) {
+ /* Open failed synchronously, probably a DNS lookup problem */
+ lm_socket_unref(socket);
+@@ -1118,6 +1122,7 @@ lm_socket_create (GMainContext *context,
+
+ return NULL;
+ }
++#endif /* HAVE_ASYNCNS */
+
+
+ /* If the connection fails synchronously, we don't want to call the
More information about the pkg-gnome-commits
mailing list