mirror of
https://github.com/curl/curl.git
synced 2026-07-28 21:23:06 +03:00
- Constantine Sapuntzakis fixed a bug when doing proxy CONNECT with the multi
interface, and the proxy would send Connection: close during the authentication phase. http://curl.haxx.se/bug/view.cgi?id=2069047
This commit is contained in:
parent
a243dd4587
commit
13dc82b9d4
5 changed files with 25 additions and 2 deletions
|
|
@ -163,7 +163,7 @@ while (<TXT>) {
|
|||
. MIME::Base64::encode($data)
|
||||
. "-----END CERTIFICATE-----\n";
|
||||
open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
|
||||
print CRT "\n$caname\n";
|
||||
print CRT "\n\"$caname\"\n";
|
||||
print CRT ("=" x length($caname) . "\n");
|
||||
if (!$opt_t) {
|
||||
print CRT $pem;
|
||||
|
|
|
|||
12
lib/multi.c
12
lib/multi.c
|
|
@ -1009,7 +1009,17 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
|||
/* this is HTTP-specific, but sending CONNECT to a proxy is HTTP... */
|
||||
easy->result = Curl_http_connect(easy->easy_conn, &protocol_connect);
|
||||
|
||||
if(CURLE_OK == easy->result) {
|
||||
if(easy->easy_conn->bits.proxy_connect_closed) {
|
||||
/* reset the error buffer */
|
||||
if(easy->easy_handle->set.errorbuffer)
|
||||
easy->easy_handle->set.errorbuffer[0] = '\0';
|
||||
easy->easy_handle->state.errorbuf = FALSE;
|
||||
|
||||
easy->result = CURLE_OK;
|
||||
result = CURLM_CALL_MULTI_PERFORM;
|
||||
multistate(easy, CURLM_STATE_CONNECT);
|
||||
}
|
||||
else if (CURLE_OK == easy->result) {
|
||||
if(!easy->easy_conn->bits.tunnel_connecting)
|
||||
multistate(easy, CURLM_STATE_WAITCONNECT);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue