multi: progress function abort must close connection

bagder · bagder · commit 9dd85bced56f · 2011-10-02T19:28:39.000+02:00
When the progress function returns to cancel the request, we must mark the connection to get closed and it must do to the DONE state. do_init() must be called as early as possible so that state variables for new connections are reset early. We could otherwise see that the old values were still there when a connection was to be disconnected very early and it would make it behave wrongly. Bug: http://curl.haxx.se/mail/lib-2011-10/0006.html Reported by: Vladimir Grishchenko
diff --git a/lib/multi.c b/lib/multi.c
@@ -1657,8 +1657,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
       }
       /* if there's still a connection to use, call the progress function */
       else if(easy->easy_conn && Curl_pgrsUpdate(easy->easy_conn)) {
-        easy->result = CURLE_ABORTED_BY_CALLBACK;
-        multistate(easy, CURLM_STATE_COMPLETED);
+        /* aborted due to progress callback return code must close the
+           connection */
+        easy->easy_conn->bits.close = TRUE;
+
+        /* if not yet in DONE state, go there, otherwise COMPLETED */
+        multistate(easy, (easy->state < CURLM_STATE_DONE)?
+                   CURLM_STATE_DONE: CURLM_STATE_COMPLETED);
+        result = CURLM_CALL_MULTI_PERFORM;
       }
     }
   } WHILE_FALSE; /* just to break out from! */
diff --git a/lib/url.c b/lib/url.c
@@ -136,6 +136,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
 static long ConnectionKillOne(struct SessionHandle *data);
 static void conn_free(struct connectdata *conn);
 static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke);
+static CURLcode do_init(struct connectdata *conn);
 
 /*
  * Protocol table.
@@ -4988,6 +4989,9 @@ static CURLcode create_conn(struct SessionHandle *data,
     ConnectionStore(data, conn);
   }
 
+  /* Setup and init stuff before DO starts, in preparing for the transfer. */
+  do_init(conn);
+
   /*
    * Setup whatever necessary for a resumed transfer
    */
@@ -5334,9 +5338,6 @@ CURLcode Curl_do(struct connectdata **connp, bool *done)
   struct connectdata *conn = *connp;
   struct SessionHandle *data = conn->data;
 
-  /* setup and init stuff before DO starts, in preparing for the transfer */
-  do_init(conn);
-
   if(conn->handler->do_it) {
     /* generic protocol-specific function pointer set in curl_connect() */
     result = conn->handler->do_it(conn, done);

Original file line number	Diff line number	Diff line change
`@@ -1657,8 +1657,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,`
`1657`	`1657`	`}`
`1658`	`1658`	`/* if there's still a connection to use, call the progress function */`
`1659`	`1659`	`else if(easy->easy_conn && Curl_pgrsUpdate(easy->easy_conn)) {`
`1660`		`- easy->result = CURLE_ABORTED_BY_CALLBACK;`
`1661`		`- multistate(easy, CURLM_STATE_COMPLETED);`
	`1660`	`+ /* aborted due to progress callback return code must close the`
	`1661`	`+ connection */`
	`1662`	`+ easy->easy_conn->bits.close = TRUE;`
	`1663`	`+`
	`1664`	`+ /* if not yet in DONE state, go there, otherwise COMPLETED */`
	`1665`	`+ multistate(easy, (easy->state < CURLM_STATE_DONE)?`
	`1666`	`+ CURLM_STATE_DONE: CURLM_STATE_COMPLETED);`
	`1667`	`+ result = CURLM_CALL_MULTI_PERFORM;`
`1662`	`1668`	`}`
`1663`	`1669`	`}`
`1664`	`1670`	`} WHILE_FALSE; /* just to break out from! */`