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

multi: better failed connect treatment

Browse Source 
When failing to connect the protocol during the CURLM_STATE_PROTOCONNECT
state, Curl_done() has to be called with the premature flag set TRUE as
for the pingpong protocols this can be important.

When Curl_done() is called with premature == TRUE, it needs to call
Curl_disconnect() with its 'dead_connection' argument set to TRUE as
well so that any protocol handler's disconnect function won't attempt to
use the (control) connection for anything.

This problem caused the pingpong protocols to fail to disconnect when
STARTTLS failed.

Reported by: Alona Rossen
Bug: http://curl.haxx.se/mail/lib-2011-02/0195.html
This commit is contained in:
Daniel Stenberg 2011-02-17 23:51:43 +01:00
parent 05895927f5
commit d85cae9225
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/multi.c
View File

@ -1189,7 +1189,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
else if(easy->result) {
/* failure detected */
Curl_posttransfer(data);
Curl_done(&easy->easy_conn, easy->result, FALSE);
Curl_done(&easy->easy_conn, easy->result, TRUE);
disconnect_conn = TRUE;
}
break;

2
lib/url.c
View File

@ -5281,7 +5281,7 @@ CURLcode Curl_done(struct connectdata **connp,
*/
if(data->set.reuse_forbid || conn->bits.close || premature ||
(-1 == conn->connectindex)) {
CURLcode res2 = Curl_disconnect(conn, FALSE); /* close the connection */
CURLcode res2 = Curl_disconnect(conn, premature); /* close the connection */
/* If we had an error already, make sure we return that one. But
if we got a new error, return that. */