public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-misc/curl/files: curl-7.34.0-fix-ipv6-failover.patch
@ 2013-12-27 16:49 Anthony G. Basile (blueness)
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-12-27 16:49 UTC (permalink / raw
  To: gentoo-commits

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;





^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/curl/files: curl-7.34.0-fix-ipv6-failover.patch
@ 2014-02-27 14:22 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2014-02-27 14:22 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    14/02/27 14:22:30

  Removed:              curl-7.34.0-fix-ipv6-failover.patch
  Log:
  Removed vulnerable version (bug #499902)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-27 14:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-27 16:49 [gentoo-commits] gentoo-x86 commit in net-misc/curl/files: curl-7.34.0-fix-ipv6-failover.patch Anthony G. Basile (blueness)
  -- strict thread matches above, loose matches on Subject: below --
2014-02-27 14:22 Lars Wendler (polynomial-c)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox