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

- Jeff Pohlmeyer identified two problems: first a rather obscure problem with

Browse source 
the multi interface and connection re-use that could make a
  curl_multi_remove_handle() ruin a pointer in another handle.

  The second problem was less of an actual problem but more of minor quirk:
  the re-using of connections wasn't properly checking if the connection was
  marked for closure.
This commit is contained in:
Daniel Stenberg 2007-02-18 23:02:42 +00:00
parent 300cbc2e21
commit cbf58d88d0
6 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/http.c
View file

@ -1403,6 +1403,10 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
data=conn->data;
/* We default to persistent connections. We set this already in this connect
function to make the re-use checks properly be able to check this bit. */
conn->bits.close = FALSE;
/* If we are not using a proxy and we want a secure connection, perform SSL
* initialization & connection now. If using a proxy with https, then we
* must tell the proxy to CONNECT to the host we want to talk to. Only
@ -1674,9 +1678,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
else
http = data->reqdata.proto.http;
/* We default to persistent connections */
conn->bits.close = FALSE;
if ( (conn->protocol&(PROT_HTTP|PROT_FTP)) &&
data->set.upload) {
httpreq = HTTPREQ_PUT;

9
lib/multi.c
View file

@ -542,11 +542,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
easy->easy_handle->dns.hostcachetype = HCACHE_NONE;
}
/* if we have a connection we must call Curl_done() here so that we
don't leave a half-baked one around */
if(easy->easy_conn) {
/* Set up the association right */
easy->easy_conn->data = easy->easy_handle;
/* we must call Curl_done() here (if we still "own it") so that we don't
leave a half-baked one around */
if(easy->easy_conn &&
(easy->easy_conn->data == easy->easy_handle)) {
/* Curl_done() clears the conn->data field to lose the association
between the easy handle and the connection */

18
lib/url.c
View file

@ -2030,7 +2030,8 @@ ConnectionExists(struct SessionHandle *data,
from the multi */
}
infof(data, "Examining connection #%ld for reuse\n", check->connectindex);
DEBUGF(infof(data, "Examining connection #%ld for reuse\n",
check->connectindex));
if(check->inuse && !canPipeline) {
/* can only happen within multi handles, and means that another easy
@ -2056,11 +2057,11 @@ ConnectionExists(struct SessionHandle *data,
continue;
}
if (data->state.is_in_pipeline && check->bits.close) {
/* Don't pick a connection that is going to be closed */
infof(data, "Connection #%ld has been marked for close, can't reuse\n",
check->connectindex);
continue;
if (check->bits.close) {
/* Don't pick a connection that is going to be closed. */
infof(data, "Connection #%ld has been marked for close, can't reuse\n",
check->connectindex);
continue;
}
if((needle->protocol&PROT_SSL) != (check->protocol&PROT_SSL))
@ -4136,8 +4137,9 @@ CURLcode Curl_async_resolved(struct connectdata *conn,
CURLcode Curl_done(struct connectdata **connp,
CURLcode status, bool premature) /* an error if this is called after an
error was detected */
CURLcode status, /* an error if this is called after an
error was detected */
bool premature)
{
CURLcode result;
struct connectdata *conn = *connp;