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

Following locations properly, if told to do so.

Browse Source
This commit is contained in:
Daniel Stenberg 2002-10-07 13:38:59 +00:00
parent 5f649a1649
commit 9b296e65bd
1 changed files with 32 additions and 6 deletions

38
lib/multi.c

@ -403,14 +403,40 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
case CURLM_STATE_PERFORM: case CURLM_STATE_PERFORM:
/* read/write data if it is ready to do so */ /* read/write data if it is ready to do so */
easy->result = Curl_readwrite(easy->easy_conn, &done); easy->result = Curl_readwrite(easy->easy_conn, &done);
/* hm, when we follow redirects, we may need to go back to the CONNECT
state */ if(easy->result) {
/* The transfer phase returned error, we mark the connection to get
* closed to prevent being re-used. This is becasue we can't
* possibly know if the connection is in a good shape or not now. */
easy->easy_conn->bits.close = TRUE;
if(-1 !=easy->easy_conn->secondarysocket) {
/* if we failed anywhere, we must clean up the secondary socket if
it was used */
sclose(easy->easy_conn->secondarysocket);
easy->easy_conn->secondarysocket=-1;
}
Curl_posttransfer(easy->easy_handle);
Curl_done(easy->easy_conn);
}
/* after the transfer is done, go DONE */ /* after the transfer is done, go DONE */
if(TRUE == done) { else if(TRUE == done) {
/* call this even if the readwrite function returned error */ /* call this even if the readwrite function returned error */
easy->result = Curl_posttransfer(easy->easy_handle); Curl_posttransfer(easy->easy_handle);
easy->state = CURLM_STATE_DONE;
result = CURLM_CALL_MULTI_PERFORM; /* When we follow redirects, must to go back to the CONNECT state */
if(easy->easy_conn->newurl) {
easy->result = Curl_follow(easy->easy_handle,
strdup(easy->easy_conn->newurl));
if(CURLE_OK == easy->result)
easy->state = CURLM_STATE_CONNECT;
}
else {
easy->state = CURLM_STATE_DONE;
result = CURLM_CALL_MULTI_PERFORM;
}
} }
break; break;
case CURLM_STATE_DONE: case CURLM_STATE_DONE: