mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

make sure the code deals with failures on the DO_MORE state properly

Browse Source
This commit is contained in:
Daniel Stenberg 2007-11-03 14:44:38 +00:00
parent 2ec8f77f21
commit 51009a40b4
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/multi.c
View File

@ -935,28 +935,28 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
/* Add this handle to the send pipeline */ /* Add this handle to the send pipeline */
easy->result = Curl_addHandleToPipeline(easy->easy_handle, easy->result = Curl_addHandleToPipeline(easy->easy_handle,
easy->easy_conn->send_pipe); easy->easy_conn->send_pipe);
if(CURLE_OK == easy->result) { if(CURLE_OK == easy->result) {
if(async) if(async)
/* We're now waiting for an asynchronous name lookup */ /* We're now waiting for an asynchronous name lookup */
multistate(easy, CURLM_STATE_WAITRESOLVE); multistate(easy, CURLM_STATE_WAITRESOLVE);
else { else {
/* after the connect has been sent off, go WAITCONNECT unless the /* after the connect has been sent off, go WAITCONNECT unless the
protocol connect is already done and we can go directly to protocol connect is already done and we can go directly to
WAITDO! */ WAITDO! */
result = CURLM_CALL_MULTI_PERFORM; result = CURLM_CALL_MULTI_PERFORM;
if(protocol_connect) if(protocol_connect)
multistate(easy, CURLM_STATE_WAITDO); multistate(easy, CURLM_STATE_WAITDO);
else { else {
#ifndef CURL_DISABLE_HTTP #ifndef CURL_DISABLE_HTTP
if (easy->easy_conn->bits.tunnel_connecting) if (easy->easy_conn->bits.tunnel_connecting)
multistate(easy, CURLM_STATE_WAITPROXYCONNECT); multistate(easy, CURLM_STATE_WAITPROXYCONNECT);
else else
#endif #endif
multistate(easy, CURLM_STATE_WAITCONNECT); multistate(easy, CURLM_STATE_WAITCONNECT);
} }
} }
} }
} }
break; break;
@ -1057,7 +1057,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
/* protocol-specific connect phase */ /* protocol-specific connect phase */
easy->result = Curl_protocol_connecting(easy->easy_conn, easy->result = Curl_protocol_connecting(easy->easy_conn,
&protocol_connect); &protocol_connect);
if(protocol_connect) { if((easy->result == CURLE_OK) && protocol_connect) {
/* after the connect has completed, go WAITDO */ /* after the connect has completed, go WAITDO */
multistate(easy, CURLM_STATE_WAITDO); multistate(easy, CURLM_STATE_WAITDO);
result = CURLM_CALL_MULTI_PERFORM; result = CURLM_CALL_MULTI_PERFORM;
@ -1181,15 +1181,20 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
if(CURLE_OK == easy->result) if(CURLE_OK == easy->result)
easy->result = Curl_readwrite_init(easy->easy_conn); easy->result = Curl_readwrite_init(easy->easy_conn);
else
/* Remove ourselves from the send pipeline */ /* No need to remove ourselves from the send pipeline here since that
Curl_removeHandleFromPipeline(easy->easy_handle, is done for us in Curl_done() */
easy->easy_conn->send_pipe);
if(CURLE_OK == easy->result) { if(CURLE_OK == easy->result) {
multistate(easy, CURLM_STATE_DO_DONE); multistate(easy, CURLM_STATE_DO_DONE);
result = CURLM_CALL_MULTI_PERFORM; result = CURLM_CALL_MULTI_PERFORM;
} }
else {
/* failure detected */
Curl_posttransfer(easy->easy_handle);
Curl_done(&easy->easy_conn, easy->result, FALSE);
disconnect_conn = TRUE;
}
} }
break; break;