diff -r a2947ea63cb4 -r e6875808924e lib/multi.c --- a/lib/multi.c Fri Jul 24 10:32:18 2009 -0700 +++ b/lib/multi.c Fri Jul 31 14:28:02 2009 -0700 @@ -192,7 +192,9 @@ static CURLcode addHandleToSendOrPendPipeline(struct SessionHandle *handle, struct connectdata *conn); static int checkPendPipeline(struct connectdata *conn); -static void moveHandleFromSendToRecvPipeline(struct SessionHandle *habdle, +static void moveHandleFromSendToRecvPipeline(struct SessionHandle *handle, + struct connectdata *conn); +static void moveHandleFromRecvToDonePipeline(struct SessionHandle *handle, struct connectdata *conn); static bool isHandleAtHead(struct SessionHandle *handle, struct curl_llist *pipeline); @@ -233,14 +235,16 @@ easy->state = state; #ifdef CURLDEBUG - if(easy->state > CURLM_STATE_CONNECT && - easy->state < CURLM_STATE_COMPLETED) - connectindex = easy->easy_conn->connectindex; + if(easy->easy_conn) { + if(easy->state > CURLM_STATE_CONNECT && + easy->state < CURLM_STATE_COMPLETED) + connectindex = easy->easy_conn->connectindex; - infof(easy->easy_handle, - "STATE: %s => %s handle %p; (connection #%ld) \n", - statename[oldstate], statename[easy->state], - (char *)easy, connectindex); + infof(easy->easy_handle, + "STATE: %s => %s handle %p; (connection #%ld) \n", + statename[oldstate], statename[easy->state], + (char *)easy, connectindex); + } #endif if(state == CURLM_STATE_COMPLETED) /* changing to COMPLETED means there's one less easy handle 'alive' */ @@ -925,7 +929,7 @@ break; } - if(easy->state > CURLM_STATE_CONNECT && + if(easy->easy_conn && easy->state > CURLM_STATE_CONNECT && easy->state < CURLM_STATE_COMPLETED) /* Make sure we set the connection's current owner */ easy->easy_conn->data = easy->easy_handle; @@ -1150,6 +1154,20 @@ if(CURLE_OK == easy->result) { + /* + * Curl_do will destroy the easy_conn and create a new connection if + * it encounters a SEND_ERROR as part of its processing. If this + * occurs, the SessionHandle needs to be re-inserted onto the head of + * the send pipeline. Check to make sure that it is still there, and + * if not, add it back. + */ + if(!isHandleAtHead(easy->easy_handle, easy->easy_conn->send_pipe)) { + DEBUGASSERT(Curl_llist_count(easy->easy_conn->send_pipe) == 0); + Curl_llist_insert_next(easy->easy_conn->send_pipe, + easy->easy_conn->send_pipe->tail, easy->easy_handle); + easy->easy_conn->writechannel_inuse = TRUE; + } + if(!dophase_done) { /* DO was not completed in one function call, we must continue DOING... */ @@ -1331,8 +1349,8 @@ Curl_posttransfer(easy->easy_handle); /* we're no longer receving */ - Curl_removeHandleFromPipeline(easy->easy_handle, - easy->easy_conn->recv_pipe); + moveHandleFromRecvToDonePipeline(easy->easy_handle, + easy->easy_conn); /* expire the new receiving pipeline head */ if(easy->easy_conn->recv_pipe->head) @@ -1386,22 +1404,28 @@ break; case CURLM_STATE_DONE: - /* Remove ourselves from the receive pipeline */ - Curl_removeHandleFromPipeline(easy->easy_handle, - easy->easy_conn->recv_pipe); - /* Check if we can move pending requests to send pipe */ - checkPendPipeline(easy->easy_conn); - if(easy->easy_conn->bits.stream_was_rewound) { - /* This request read past its response boundary so we quickly let the - other requests consume those bytes since there is no guarantee that - the socket will become active again */ - result = CURLM_CALL_MULTI_PERFORM; + if(easy->easy_conn) { + /* Remove ourselves from the receive and done pipelines. Handle + should be on one of these lists, depending upon how we got here. */ + Curl_removeHandleFromPipeline(easy->easy_handle, + easy->easy_conn->recv_pipe); + Curl_removeHandleFromPipeline(easy->easy_handle, + easy->easy_conn->done_pipe); + /* Check if we can move pending requests to send pipe */ + checkPendPipeline(easy->easy_conn); + + if(easy->easy_conn->bits.stream_was_rewound) { + /* This request read past its response boundary so we quickly let the + other requests consume those bytes since there is no guarantee that + the socket will become active again */ + result = CURLM_CALL_MULTI_PERFORM; + } + + /* post-transfer command */ + easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE); } - /* post-transfer command */ - easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE); - /* after we have DONE what we're supposed to do, go COMPLETED, and it doesn't matter what the Curl_done() returned! */ multistate(easy, CURLM_STATE_COMPLETED); @@ -1443,6 +1467,8 @@ easy->easy_conn->send_pipe); Curl_removeHandleFromPipeline(easy->easy_handle, easy->easy_conn->recv_pipe); + Curl_removeHandleFromPipeline(easy->easy_handle, + easy->easy_conn->done_pipe); /* Check if we can move pending requests to send pipe */ checkPendPipeline(easy->easy_conn); } @@ -2174,6 +2200,21 @@ } } +static void moveHandleFromRecvToDonePipeline(struct SessionHandle *handle, + struct connectdata *conn) +{ + struct curl_llist_element *curr; + + curr = conn->recv_pipe->head; + while(curr) { + if(curr->ptr == handle) { + Curl_llist_move(conn->recv_pipe, curr, + conn->done_pipe, conn->done_pipe->tail); + break; + } + curr = curr->next; + } +} static bool isHandleAtHead(struct SessionHandle *handle, struct curl_llist *pipeline) { diff -r a2947ea63cb4 -r e6875808924e lib/url.c --- a/lib/url.c Fri Jul 24 10:32:18 2009 -0700 +++ b/lib/url.c Fri Jul 31 14:28:02 2009 -0700 @@ -142,7 +142,7 @@ /* Local static prototypes */ static long ConnectionKillOne(struct SessionHandle *data); static void conn_free(struct connectdata *conn); -static void signalPipeClose(struct curl_llist *pipeline); +static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke); #ifdef CURL_DISABLE_VERBOSE_STRINGS #define verboseconnect(x) do { } while (0) @@ -410,6 +410,16 @@ } } } + pipeline = connptr->done_pipe; + if(pipeline) { + for (curr = pipeline->head; curr; curr=curr->next) { + if(data == (struct SessionHandle *) curr->ptr) { + fprintf(stderr, + "MAJOR problem we %p are still in done pipe for %p done %d\n", + data, connptr, (int)connptr->bits.done); + } + } + } pipeline = connptr->pend_pipe; if(pipeline) { for (curr = pipeline->head; curr; curr=curr->next) { @@ -2275,6 +2285,7 @@ Curl_llist_destroy(conn->send_pipe, NULL); Curl_llist_destroy(conn->recv_pipe, NULL); Curl_llist_destroy(conn->pend_pipe, NULL); + Curl_llist_destroy(conn->done_pipe, NULL); /* possible left-overs from the async name resolvers */ #if defined(USE_ARES) @@ -2374,9 +2385,10 @@ /* Indicate to all handles on the pipe that we're dead */ if(Curl_isPipeliningEnabled(data)) { - signalPipeClose(conn->send_pipe); - signalPipeClose(conn->recv_pipe); - signalPipeClose(conn->pend_pipe); + signalPipeClose(conn->send_pipe, TRUE); + signalPipeClose(conn->recv_pipe, TRUE); + signalPipeClose(conn->pend_pipe, TRUE); + signalPipeClose(conn->done_pipe, FALSE); } conn_free(conn); @@ -2494,9 +2506,10 @@ if(Curl_removeHandleFromPipeline(data, conn->send_pipe) && send_head) conn->writechannel_inuse = FALSE; Curl_removeHandleFromPipeline(data, conn->pend_pipe); -} - -static void signalPipeClose(struct curl_llist *pipeline) + Curl_removeHandleFromPipeline(data, conn->done_pipe); +} + +static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke) { struct curl_llist_element *curr; @@ -2515,7 +2528,8 @@ } #endif - data->state.pipe_broke = TRUE; + if (pipe_broke) + data->state.pipe_broke = TRUE; Curl_multi_handlePipeBreak(data); Curl_llist_remove(pipeline, curr, NULL); curr = next; @@ -4174,6 +4188,7 @@ Curl_llist_destroy(old_conn->send_pipe, NULL); Curl_llist_destroy(old_conn->recv_pipe, NULL); Curl_llist_destroy(old_conn->pend_pipe, NULL); + Curl_llist_destroy(old_conn->done_pipe, NULL); Curl_safefree(old_conn->master_buffer); } @@ -4276,7 +4291,9 @@ conn->send_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); conn->recv_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); conn->pend_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); - if(!conn->send_pipe || !conn->recv_pipe || !conn->pend_pipe) + conn->done_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); + if(!conn->send_pipe || !conn->recv_pipe || !conn->pend_pipe || + !conn->done_pipe) return CURLE_OUT_OF_MEMORY; /* This initing continues below, see the comment "Continue connectdata diff -r a2947ea63cb4 -r e6875808924e lib/urldata.h --- a/lib/urldata.h Fri Jul 24 10:32:18 2009 -0700 +++ b/lib/urldata.h Fri Jul 31 14:28:02 2009 -0700 @@ -1020,6 +1020,8 @@ their responses on this pipeline */ struct curl_llist *pend_pipe; /* List of pending handles on this pipeline */ + struct curl_llist *done_pipe; /* Handles that are finished, but + still reference this connectdata */ #define MAX_PIPELINE_LENGTH 5 char* master_buffer; /* The master buffer allocated on-demand;