generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

connection setup: if HTTP is disabled asking for HTTP proxy is bad

Browse Source
This commit is contained in:
Daniel Stenberg
2011-03-17 11:45:58 +01:00
parent e38a7880e1
commit 93290f69d0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/url.c
View File

@@ -4832,9 +4832,14 @@ static CURLcode create_conn(struct SessionHandle *data,
if(proxy && !(conn->handler->flags & PROTOPT_BANPROXY)) { if(proxy && !(conn->handler->flags & PROTOPT_BANPROXY)) {
if((conn->proxytype == CURLPROXY_HTTP) || if((conn->proxytype == CURLPROXY_HTTP) ||
(conn->proxytype == CURLPROXY_HTTP_1_0)) { (conn->proxytype == CURLPROXY_HTTP_1_0)) {
#ifdef CURL_DISABLE_HTTP
/* asking for a HTTP proxy is a bit funny when HTTP is disabled... */
return CURLE_UNSUPPORTED_PROTOCOL;
#else
/* force this connection's protocol to become HTTP */ /* force this connection's protocol to become HTTP */
conn->handler = &Curl_handler_http; conn->handler = &Curl_handler_http;
conn->bits.httpproxy = TRUE; conn->bits.httpproxy = TRUE;
#endif
} }
conn->bits.proxy = TRUE; conn->bits.proxy = TRUE;
} }