diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-05-12 12:06:39 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-05-12 12:06:39 +0000 |
| commit | d60c22572b49cde9b839a59510580df079d2d5e2 (patch) | |
| tree | c67a83d1a6216ec2be4f39117f1934650a67989e /lib/multi.c | |
| parent | 1d7ce36791f32039383236e4940994c41cb2a0bf (diff) | |
Curl_done() and the protocol-specific conn->curl_done() functions now all
take a CURLcode as a second argument, that is non-zero when Curl_done()
is called after an error was returned from Curl_do() (or similar).
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/multi.c b/lib/multi.c index 0476b1d19..fe03a5dde 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -329,7 +329,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles) char *gotourl; Curl_posttransfer(easy->easy_handle); - easy->result = Curl_done(easy->easy_conn); + easy->result = Curl_done(easy->easy_conn, CURLE_OK); if(CURLE_OK == easy->result) { gotourl = strdup(easy->easy_handle->change.url); easy->easy_handle->change.url_changed = FALSE; @@ -491,7 +491,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles) easy->easy_conn->sock[SECONDARYSOCKET]=-1; } Curl_posttransfer(easy->easy_handle); - Curl_done(easy->easy_conn); + Curl_done(easy->easy_conn, easy->result); } /* after the transfer is done, go DONE */ @@ -504,7 +504,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles) if(easy->easy_conn->newurl) { char *newurl = easy->easy_conn->newurl; easy->easy_conn->newurl = NULL; - easy->result = Curl_done(easy->easy_conn); + easy->result = Curl_done(easy->easy_conn, CURLE_OK); if(easy->result == CURLE_OK) easy->result = Curl_follow(easy->easy_handle, newurl); if(CURLE_OK == easy->result) { @@ -520,7 +520,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles) break; case CURLM_STATE_DONE: /* post-transfer command */ - easy->result = Curl_done(easy->easy_conn); + easy->result = Curl_done(easy->easy_conn, CURLE_OK); /* after we have DONE what we're supposed to do, go COMPLETED, and it doesn't matter what the Curl_done() returned! */ |