aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES1
-rw-r--r--lib/url.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index c626016e0..6f81cd295 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Daniel (22 December 2006)
+- When setting a proxy with environment variables and (for example) running
+ 'curl [URL]' with a URL without a protocol prefix, curl would not send a
+ correct request as it failed to add the protocol prefix.
+
Daniel (21 December 2006)
- Robson Braga Araujo reported bug #1618359
(http://curl.haxx.se/bug/view.cgi?id=1618359) and subsequently provided a
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 251ccf7c1..71caea0ad 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -37,6 +37,7 @@ This release includes the following bugfixes:
libcurl to leak memory
o no more SIGPIPE when GnuTLS is used
o FTP downloading 2 zero byte files in a row
+ o using proxy and URLs without protocol prefixes
Other curl-related news:
diff --git a/lib/url.c b/lib/url.c
index 7b87a92c4..65ec4f1e2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2951,7 +2951,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
}
if(proxy && *proxy) {
- long bits = conn->protocol & (PROT_HTTPS|PROT_SSL);
+ long bits = conn->protocol & (PROT_HTTPS|PROT_SSL|PROT_MISSING);
data->change.proxy = proxy;
data->change.proxy_alloc=TRUE; /* this needs to be freed later */
conn->bits.httpproxy = TRUE;