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

Bogdan Nicula's second test case (posted Sun, 08 Oct 2006) converted to test

Browse Source 
case 535 and it now runs fine. Again a problem with the pipelining code not
taking all possible (error) conditions into account.
This commit is contained in:
Daniel Stenberg
2006-10-09 06:58:05 +00:00
parent eceb37bde2
commit a1de9367ec
7 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/multi.c
View File

@@ -1081,9 +1081,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
break;
case CURLM_STATE_WAITPERFORM:
infof(easy->easy_handle, "Connection #%d: recv pipe size = %d\n",
#ifdef CURLDEBUG
infof(easy->easy_handle, "Conn %d recv pipe %d inuse %d athead %d\n",
easy->easy_conn->connectindex,
easy->easy_conn->recv_pipe->size);
easy->easy_conn->recv_pipe->size,
easy->easy_conn->readchannel_inuse,
Curl_isHandleAtHead(easy->easy_handle,
easy->easy_conn->recv_pipe));
#endif
/* Wait for our turn to PERFORM */
if (!easy->easy_conn->readchannel_inuse &&
Curl_isHandleAtHead(easy->easy_handle,

13
lib/url.c
View File

@@ -1840,7 +1840,7 @@ void Curl_addHandleToPipeline(struct SessionHandle *data,
}
void Curl_removeHandleFromPipeline(struct SessionHandle *handle,
int Curl_removeHandleFromPipeline(struct SessionHandle *handle,
struct curl_llist *pipe)
{
struct curl_llist_element *curr;
@@ -1849,10 +1849,11 @@ void Curl_removeHandleFromPipeline(struct SessionHandle *handle,
while (curr) {
if (curr->ptr == handle) {
Curl_llist_remove(pipe, curr, NULL);
break;
return 1; /* we removed a handle */
}
curr = curr->next;
}
return 0;
}
#if 0
@@ -3975,8 +3976,14 @@ CURLcode Curl_done(struct connectdata **connp,
conn->bits.done = TRUE; /* called just now! */
/* cleanups done even if the connection is re-used */
if(Curl_removeHandleFromPipeline(data, conn->recv_pipe) &&
conn->readchannel_inuse)
conn->readchannel_inuse--;
if(Curl_removeHandleFromPipeline(data, conn->send_pipe) &&
conn->writechannel_inuse)
conn->writechannel_inuse--;
/* cleanups done even if the connection is re-used */
if(data->reqdata.rangestringalloc) {
free(data->reqdata.range);
data->reqdata.rangestringalloc = FALSE;

4
lib/url.h
View File

@@ -64,8 +64,8 @@ int Curl_doing_getsock(struct connectdata *conn,
void Curl_addHandleToPipeline(struct SessionHandle *handle,
struct curl_llist *pipe);
void Curl_removeHandleFromPipeline(struct SessionHandle *handle,
struct curl_llist *pipe);
int Curl_removeHandleFromPipeline(struct SessionHandle *handle,
struct curl_llist *pipe);
bool Curl_isHandleAtHead(struct SessionHandle *handle,
struct curl_llist *pipe);