From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 26 Dec 2007 23:29:35 +0000 (+0000)
Subject: Dmitry Kurochkin mentioned a flaw
X-Git-Tag: upstream/7.37.1~8278
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04e4d9a0b3ef5653c816a309866e54a3913fa585;p=platform%2Fupstream%2Fcurl.git

Dmitry Kurochkin mentioned a flaw
(http://curl.haxx.se/mail/lib-2007-12/0252.html) in detect_proxy() which
failed to set the bits.proxy variable properly when an environment variable
told libcurl to use a http proxy.
---

diff --git a/CHANGES b/CHANGES
index f02e380..37dd29a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Daniel S (27 Dec 2007)
+- Dmitry Kurochkin mentioned a flaw
+  (http://curl.haxx.se/mail/lib-2007-12/0252.html) in detect_proxy() which
+  failed to set the bits.proxy variable properly when an environment variable
+  told libcurl to use a http proxy.
+
 Daniel S (26 Dec 2007)
 - In an attempt to repeat the problem in bug report #1850730
   (http://curl.haxx.se/bug/view.cgi?id=1850730) I wrote up test case 552. The
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7ebe7de..c01740d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -39,6 +39,7 @@ This release includes the following bugfixes:
  o build fix for MSVC 9.0 (VS2008)
  o Windows curl builds failed file truncation when retry downloading
  o SSL session ID cache memory leak
+ o bad connection re-use check with environment variable-activated proxy use
 
 This release includes the following known bugs:
 
@@ -59,6 +60,7 @@ advice from friends like these:
  Dan Fandrich, Gisle Vanem, Toby Peterson, Yang Tse, Daniel Black,
  Robin Johnson, Michal Marek, Ates Goral, Andres Garcia, Rob Crittenden,
  Emil Romanus, Alessandro Vesely, Ray Pekowski, Spacen Jasset, Andrew Moise,
- Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell
+ Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
+ Dmitry Kurochkin
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/url.c b/lib/url.c
index 085ce9d..ee8b916 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3242,7 +3242,7 @@ static char *detect_proxy(struct connectdata *conn)
         if(conn->proxytype == CURLPROXY_HTTP) {
           /* force this connection's protocol to become HTTP */
           conn->protocol = PROT_HTTP | bits;
-          conn->bits.httpproxy = TRUE;
+          conn->bits.proxy = conn->bits.httpproxy = TRUE;
         }
       }
     } /* if(!nope) - it wasn't specified non-proxy */