[gentoo-commits] gentoo-x86 commit in net-misc/curl/files: curl-7.34.0-fix-ipv6-failover.patch

[Anthony G. Basile (blueness)]

blueness    13/12/27 16:49:47

  Added:                curl-7.34.0-fix-ipv6-failover.patch
  Log:
  Add patch for bug #495170
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

Revision  Changes    Path
1.1                  net-misc/curl/files/curl-7.34.0-fix-ipv6-failover.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.34.0-fix-ipv6-failover.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.34.0-fix-ipv6-failover.patch?rev=1.1&content-type=text/plain

Index: curl-7.34.0-fix-ipv6-failover.patch
===================================================================
This fixes bug #495170: hangs after hitting IPv6 address with no IPv6

See upstream: https://sourceforge.net/p/curl/bugs/1315/

diff --git a/lib/connect.c b/lib/connect.c
index 4b6ee00..97a0655 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1104,13 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* 
     conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2;

   /* start connecting to first IP */
-  res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
-  while(res != CURLE_OK &&
-        conn->tempaddr[0] &&
-        conn->tempaddr[0]->ai_next &&
-        conn->tempsock[0] == CURL_SOCKET_BAD)
-    res = trynextip(conn, FIRSTSOCKET, 0);
-
+  while(conn->tempaddr[0]) {
+    res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
+    if(res == CURLE_OK)
+        break;
+    conn->tempaddr[0] = conn->tempaddr[0]->ai_next;
+  }
   if(conn->tempsock[0] == CURL_SOCKET_BAD)
     return res;