From b2f8de571fb10f58bc3c8411bb4bbed2aa14dc52 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 22 Dec 2006 07:30:21 +0000
Subject: [PATCH] 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.

---
 CHANGES       | 5 +++++
 RELEASE-NOTES | 1 +
 lib/url.c     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c626016e09..6f81cd2959 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 251ccf7c1c..71caea0ad5 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 7b87a92c43..65ec4f1e2f 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;