moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

conncache: only allow multiplexing within same multi handle 

Connections that are used for HTTP/1.1 Pipelining or HTTP/2 multiplexing
only get additional transfers added to them if the existing connection
is held by the same multi or easy handle. libcurl does not support doing
HTTP/2 streams in different threads using a shared connection.

Closes #2152
This commit is contained in:
Daniel Stenberg 2017-12-05 08:39:31 +01:00
parent 415b8dff8e
commit ea3a5d07dc
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/libcurl/curl_share_setopt.3
View File

@ -75,8 +75,15 @@ Put the connection cache in the share object and make all easy handles using
this share object share the connection cache. Using this, you can for example this share object share the connection cache. Using this, you can for example
do multi-threaded libcurl use with one handle in each thread, and yet have a do multi-threaded libcurl use with one handle in each thread, and yet have a
shared pool of unused connections and this way get way better connection shared pool of unused connections and this way get way better connection
re-use than if you use one separate pool in each thread. Support for this was re-use than if you use one separate pool in each thread.
added in 7.57.0, but the symbol existed long before this.
Connections that are used for HTTP/1.1 Pipelining or HTTP/2 multiplexing only
get additional transfers added to them if the existing connection is held by
the same multi or easy handle. libcurl does not support doing HTTP/2 streams
in different threads using a shared connection.
Support for \fBCURL_LOCK_DATA_CONNECT\fP was added in 7.57.0, but the symbol
existed before this.
.RE .RE
.IP CURLSHOPT_UNSHARE .IP CURLSHOPT_UNSHARE
This option does the opposite of \fICURLSHOPT_SHARE\fP. It specifies that This option does the opposite of \fICURLSHOPT_SHARE\fP. It specifies that

5
lib/url.c
View File

@ -1264,6 +1264,11 @@ ConnectionExists(struct Curl_easy *data,
already in use so we skip it */ already in use so we skip it */
continue; continue;
if((check->inuse) && (check->data->multi != needle->data->multi))
/* this could be subject for pipeline/multiplex use, but only
if they belong to the same multi handle */
continue;
if(needle->localdev || needle->localport) { if(needle->localdev || needle->localport) {
/* If we are bound to a specific local end (IP+port), we must not /* If we are bound to a specific local end (IP+port), we must not
re-use a random other one, although if we didn't ask for a re-use a random other one, although if we didn't ask for a