From d85cae922575d8966529fee364e6d611e3062a99 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 17 Feb 2011 23:51:43 +0100 Subject: multi: better failed connect treatment 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 --- lib/multi.c | 2 +- lib/url.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/multi.c b/lib/multi.c index 122f66b40..31127028d 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -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; diff --git a/lib/url.c b/lib/url.c index c07554182..c1dab8254 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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. */ -- cgit v1.2.3