Giancarlo Formicuccia reported and fixed a problem with a closed connection

to a proxy during CONNECT auth negotiation.

diff --git a/CHANGES b/CHANGES
index bf4f46343c99a8e183e63b9daf98550959eae174..0f0b391759e1d592498c1c69943ef57488e7061e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel S (11 July 2007)
+- Giancarlo Formicuccia reported and fixed a problem with a closed connection
+  to a proxy during CONNECT auth negotiation.
+
 Dan F (10 July 2007)
 - Fixed a curl memory leak reported by Song Ma with a modified version
   of the patch he suggested.  Added his test case as test289 to verify.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 89f1402041d7f234b4e200a197d46fcddfcc7efe..feffdbf8d2fb948942b8116e704998c927e6e3e9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following changes:
 This release includes the following bugfixes:
 
  o Test cases 31, 46, 61, 506, 517 now work in time zones that use leap seconds
+ o problem with closed proxy connection during HTTP CONNECT auth negotiation
 
 This release includes the following known bugs:
 
@@ -32,7 +33,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Dan Fandrich, Song Ma, Daniel Black
+  Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia
  
-
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/http.c b/lib/http.c
index 9c7a2bd11f08cd8aec63d372ad51fb833d713cbd..a9b483dbd67190d50510ecb120b5090ccaff00d0 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -1398,6 +1398,9 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
                   else if(Curl_compareheader(line_start,
                                              "Connection:", "close"))
                     closeConnection = TRUE;
+                  else if(Curl_compareheader(line_start,
+                                             "Proxy-Connection:", "close"))
+                    closeConnection = TRUE;
                   else if(2 == sscanf(line_start, "HTTP/1.%d %d",
                                       &subversion,
                                       &k->httpcode)) {