aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-12-26 23:29:35 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-12-26 23:29:35 +0000
commit04e4d9a0b3ef5653c816a309866e54a3913fa585 (patch)
tree5db6bac0bd224accaa6028b0c3f6306a4dcf63d6
parentf277124a0f78327f6a973518c073d6a9a458326b (diff)
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.
-rw-r--r--CHANGES6
-rw-r--r--RELEASE-NOTES4
-rw-r--r--lib/url.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index f02e3806f..37dd29a01 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 7ebe7de2c..c01740d94 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 085ce9d41..ee8b916e4 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 */