mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
my proxytunnel fix accidentally ruined the normal https connects
This commit is contained in:
parent
fc07eb45f4
commit
c2479ccb7a
14
lib/http.c
14
lib/http.c
@ -407,13 +407,13 @@ CURLcode Curl_http_connect(struct connectdata *conn)
|
|||||||
conn->hostname, conn->remote_port);
|
conn->hostname, conn->remote_port);
|
||||||
if(CURLE_OK != result)
|
if(CURLE_OK != result)
|
||||||
return result;
|
return result;
|
||||||
|
}
|
||||||
if(conn->protocol & PROT_HTTPS) {
|
|
||||||
/* now, perform the SSL initialization for this socket */
|
if(conn->protocol & PROT_HTTPS) {
|
||||||
result = Curl_SSLConnect(conn);
|
/* now, perform the SSL initialization for this socket */
|
||||||
if(result)
|
result = Curl_SSLConnect(conn);
|
||||||
return result;
|
if(result)
|
||||||
}
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(conn->bits.user_passwd && !data->state.this_is_a_follow) {
|
if(conn->bits.user_passwd && !data->state.this_is_a_follow) {
|
||||||
|
Loading…
Reference in New Issue
Block a user