romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 15:53:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

- Dmitry Kurochkin fixed Curl_done() for pipelining, as it could previously

Browse source 
crash!
This commit is contained in:
Daniel Stenberg 2008-01-29 12:58:25 +00:00
parent ceb5a8ca7b
commit 1bfbd25027
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/url.c
View file

@ -4414,11 +4414,6 @@ CURLcode Curl_done(struct connectdata **connp,
Curl_expire(data, 0); /* stop timer */
if(conn->bits.done)
return CURLE_OK; /* Curl_done() has already been called */
conn->bits.done = TRUE; /* called just now! */
if(Curl_removeHandleFromPipeline(data, conn->recv_pipe) &&
conn->readchannel_inuse)
conn->readchannel_inuse = FALSE;
@ -4427,6 +4422,16 @@ CURLcode Curl_done(struct connectdata **connp,
conn->writechannel_inuse = FALSE;
Curl_removeHandleFromPipeline(data, conn->pend_pipe);
if(conn->bits.done ||
(conn->send_pipe->size + conn->recv_pipe->size != 0 &&
!data->set.reuse_forbid &&
!conn->bits.close))
/* Stop if Curl_done() has already been called or pipeline
is not empty and we do not have to close connection. */
return CURLE_OK;
conn->bits.done = TRUE; /* called just now! */
/* Cleanup possible redirect junk */
if(data->req.newurl) {
free(data->req.newurl);