diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-08-12 19:36:56 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-08-16 09:33:12 +0200 |
| commit | 09da53998e04f2a375c6cafee6a4768a997d64fa (patch) | |
| tree | 20ee57e9482d88d3dcabe661433f9513c8d2096f /lib/multi.c | |
| parent | 099f37e9c5779a5701735b40e7e4b09ce33a4786 (diff) | |
| download | curl-09da53998e04f2a375c6cafee6a4768a997d64fa.tar.gz | |
urldata: remove unused pipe_broke struct field
This struct field is never set TRUE in any existing code path. This
change removes the field completely.
Closes #2871
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/lib/multi.c b/lib/multi.c index ee8be3971..c2c5e1c27 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -874,12 +874,10 @@ static int multi_getsock(struct Curl_easy *data, of sockets */ int numsocks) { - /* If the pipe broke, or if there's no connection left for this easy handle, - then we MUST bail out now with no bitmask set. The no connection case can - happen when this is called from curl_multi_remove_handle() => - singlesocket() => multi_getsock(). + /* The no connection case can happen when this is called from + curl_multi_remove_handle() => singlesocket() => multi_getsock(). */ - if(data->state.pipe_broke || !data->easy_conn) + if(!data->easy_conn) return 0; if(data->mstate > CURLM_STATE_CONNECT && @@ -1352,24 +1350,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, bool stream_error = FALSE; rc = CURLM_OK; - /* Handle the case when the pipe breaks, i.e., the connection - we're using gets cleaned up and we're left with nothing. */ - if(data->state.pipe_broke) { - infof(data, "Pipe broke: handle %p, url = %s\n", - (void *)data, data->state.path); - - if(data->mstate < CURLM_STATE_COMPLETED) { - /* Head back to the CONNECT state */ - multistate(data, CURLM_STATE_CONNECT); - rc = CURLM_CALL_MULTI_PERFORM; - result = CURLE_OK; - } - - data->state.pipe_broke = FALSE; - data->easy_conn = NULL; - continue; - } - if(!data->easy_conn && data->mstate > CURLM_STATE_CONNECT && data->mstate < CURLM_STATE_DONE) { @@ -2103,8 +2083,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, /* NOTE: no attempt to disconnect connections must be made in the case blocks above - cleanup happens only here */ - data->state.pipe_broke = FALSE; - /* Check if we can move pending requests to send pipe */ process_pending_handles(multi); /* connection */ |