From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 13 Jul 2007 20:17:35 +0000 (+0000)
Subject: Colin Hogben filed bug report #1750274
X-Git-Tag: upstream/7.37.1~8920
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46c699c483f3e453fa6b0e8f69846ecce95a1a0f;p=platform%2Fupstream%2Fcurl.git

Colin Hogben filed bug report #1750274
(http://curl.haxx.se/bug/view.cgi?id=1750274) and submitted a patch for the
case where libcurl did a connect attempt to a non-listening port and didn't
provide a human readable error string back.
---

diff --git a/CHANGES b/CHANGES
index 88f3bf6..e5be0fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,10 +7,17 @@
                                   Changelog
 
 Daniel S (13 July 2007)
+- Colin Hogben filed bug report #1750274
+  (http://curl.haxx.se/bug/view.cgi?id=1750274) and submitted a patch for the
+  case where libcurl did a connect attempt to a non-listening port and didn't
+  provide a human readable error string back.
+
 - Daniel Cater fixes:
   1 - made 'make vc8' work on windows.
   2 - made libcurl itself built with CURL_NO_OLDIES defined (which doesn't
       define the symbols for backwards source compatibility)
+  3 - updated libcurl-errors.3
+  4 - added CURL_DISABLE_TFTP to docs/INSTALL
 
 Daniel S (12 July 2007)
 - Made the krb5 code build with Heimdal's GSSAPI lib.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 64f0384..7f1ccf4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following bugfixes:
  o CURLOPT_SSL_VERIFYHOST set to 1
  o CONNECT endless loop
  o krb5 support builds with Heimdal
+ o added returned error string for connection refused case
 
 This release includes the following known bugs:
 
@@ -38,6 +39,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia, Shmulik Regev,
- Daniel Cater
+ Daniel Cater, Colin Hogben
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/connect.c b/lib/connect.c
index 65b2878..d608e1e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -577,6 +577,8 @@ CURLcode Curl_is_connected(struct connectdata *conn,
     data->state.os_errno = error;
     infof(data, "Connection failed\n");
     if(trynextip(conn, sockindex, connected)) {
+      failf(data, "Failed connect to %s:%d; %s",
+            conn->host.name, conn->port, Curl_strerror(conn, error));
       code = CURLE_COULDNT_CONNECT;
     }
   }
@@ -596,7 +598,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
       error = SOCKERRNO;
       data->state.os_errno = error;
       failf(data, "Failed connect to %s:%d; %s",
-            conn->host.name, conn->port, Curl_strerror(conn,error));
+            conn->host.name, conn->port, Curl_strerror(conn, error));
       code = CURLE_COULDNT_CONNECT;
     }
   }