Commit 90b0f383 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Another socks5-fix. Make sure that when we use a socks-proxy, it is not the 

same as using a httpproxy so we must make sure to better check for http
proxies before we do HTTP proxy stuff. This included authorization and
URI usage in the request etc.
parent 18f630ab

lib/http.c

+3 −3
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ CURLcode Curl_http(struct connectdata *conn) 
                             (bool)(conn->protocol&PROT_HTTPS?TRUE:FALSE));

  }



  if (data->change.proxy && *data->change.proxy &&

  if (conn->bits.httpproxy &&

      !data->set.tunnel_thru_httpproxy &&

      !(conn->protocol&PROT_HTTPS))  {

    /* The path sent to the proxy is in fact the entire URL */
@@ -936,8 +936,8 @@ CURLcode Curl_http(struct connectdata *conn) 
                request,

                ppath,

                httpstring,

                (conn->bits.proxy_user_passwd &&

                 conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"",

                (conn->bits.httpproxy && conn->allocptr.proxyuserpwd)?

                conn->allocptr.proxyuserpwd:"",

                conn->allocptr.userpwd?conn->allocptr.userpwd:"",

                (conn->bits.use_range && conn->allocptr.rangeline)?

                conn->allocptr.rangeline:"",