- Tom Mueller correctly reported in bug report #2870221

  (http://curl.haxx.se/bug/view.cgi?id=2870221) that libcurl returned an
  incorrect return code from the internal trynextip() function which caused
  him grief. This is a regression that was introduced in 7.19.1 and I find it
  strange it hasn't hit us harder, but I won't persue into figuring out
  exactly why.

diff --git a/CHANGES b/CHANGES
index d0dbdb1b4ed71041caca263d56650169323fdcd5..f982d8feaecf24ac279b987b481e8bb76d74465e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,13 @@
                                   Changelog
 
 Daniel Stenberg (1 Oct 2009)
+- Tom Mueller correctly reported in bug report #2870221
+  (http://curl.haxx.se/bug/view.cgi?id=2870221) that libcurl returned an
+  incorrect return code from the internal trynextip() function which caused
+  him grief. This is a regression that was introduced in 7.19.1 and I find it
+  strange it hasn't hit us harder, but I won't persue into figuring out
+  exactly why.
+ 
 - Constantine Sapuntzakis: The current implementation will always set
   SO_SNDBUF to CURL_WRITE_SIZE even if the SO_SNDBUF starts out larger.  The
   patch doesn't do a setsockopt if SO_SNDBUF is already greater than

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b3a1d013b8dea8b52f9e286f832cc549a46cbf6b..a6fe91ab72fd68ab4563ada34e6dc77b52bda1df 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -34,6 +34,7 @@ This release includes the following bugfixes:
  o received cookies without explicit path got saved wrong if the URL had a
    query part
  o don't shrink SO_SNDBUF on windows for those who have it set large already
+ o connect next bug
 
 This release includes the following known bugs:
 
@@ -45,6 +46,6 @@ advice from friends like these:
  Karl Moerder, Kamil Dudka, Krister Johansen, Andre Guibert de Bruet,
  Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester, Daniel Johnson,
  Claes Jakobsson, Sven Anders, Chris Mumford, John P. McCaskey,
- Constantine Sapuntzakis
+ Constantine Sapuntzakis, Michael Stillwell, Tom Mueller
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/connect.c b/lib/connect.c
index aaeee676204cc07d3489aff39194e0a7af0eed2d..affb7fec567f0a4306c0aa6d79a119edfbfdb1f3 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -502,7 +502,7 @@ static bool trynextip(struct connectdata *conn,
       /* store the new socket descriptor */
       conn->sock[sockindex] = sockfd;
       conn->ip_addr = ai;
-      break;
+      return FALSE;
     }
     ai = ai->ai_next;
   }