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

create_conn: only switch protocol handler if necessary

Browse Source 
When switching to HTTP because a HTTP proxy is being used, the existing
handler is now checked if it already is "compatible". This allows the https
handler remain while other non-http handlers will be redirected.

Bug: http://curl.haxx.se/mail/lib-2011-05/0214.html
Reported by: Jerome Robert
This commit is contained in:
Daniel Stenberg
2011-05-25 15:57:38 +02:00
parent 340228cc81
commit 017ee34bba
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/url.c
View File

@@ -4812,8 +4812,11 @@ static CURLcode create_conn(struct SessionHandle *data,
/* asking for a HTTP proxy is a bit funny when HTTP is disabled... */ /* asking for a HTTP proxy is a bit funny when HTTP is disabled... */
return CURLE_UNSUPPORTED_PROTOCOL; return CURLE_UNSUPPORTED_PROTOCOL;
#else #else
/* force this connection's protocol to become HTTP */ /* force this connection's protocol to become HTTP if not already
compatible */
if(!(conn->handler->protocol & CURLPROTO_HTTP))
conn->handler = &Curl_handler_http; conn->handler = &Curl_handler_http;
conn->bits.httpproxy = TRUE; conn->bits.httpproxy = TRUE;
#endif #endif
} }