Commit 17f34329 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

create_conn: mark non-HTTP proxies accordingly 

A proxy could be marked 'httpproxy' wrongly before if set with an
environment variable or with the CURLOPT_PROXY option with a socks*://
prefix or similar.

Added test 710 to verify

Bug: http://curl.haxx.se/mail/lib-2011-07/0194.html
parent 75fa3d2d

lib/url.c

+4 −0
Original line number Diff line number Diff line
@@ -3501,6 +3501,8 @@ static struct connectdata *allocate_conn(struct SessionHandle *data) 


#else /* CURL_DISABLE_PROXY */



  /* note that these two proxy bits are now just on what looks to be

     requested, they may be altered down the road */

  conn->bits.proxy = (bool)(data->set.str[STRING_PROXY] &&

                            *data->set.str[STRING_PROXY]);

  conn->bits.httpproxy = (bool)(conn->bits.proxy &&
@@ -4825,6 +4827,8 @@ static CURLcode create_conn(struct SessionHandle *data, 
      conn->bits.httpproxy = TRUE;

#endif

    }

    else

      conn->bits.httpproxy = FALSE; /* not a HTTP proxy */

    conn->bits.proxy = TRUE;

  }

  else {