mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-23 15:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

ConnectionExists: improve non-multiplexing use case

Browse Source 
- better log output

- make sure multiplex is enabled for it to be used
This commit is contained in:
Daniel Stenberg 2019-04-30 11:16:53 +02:00
parent be6e281cf2
commit 41fcdf71a1
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/url.c
View File

@ -1031,7 +1031,7 @@ ConnectionExists(struct Curl_easy *data,
/* We can't multiplex if we don't know anything about the server */ /* We can't multiplex if we don't know anything about the server */
if(canmultiplex) { if(canmultiplex) {
if(bundle->multiuse <= BUNDLE_UNKNOWN) { if(bundle->multiuse == BUNDLE_UNKNOWN) {
if((bundle->multiuse == BUNDLE_UNKNOWN) && data->set.pipewait) { if((bundle->multiuse == BUNDLE_UNKNOWN) && data->set.pipewait) {
infof(data, "Server doesn't support multiplex yet, wait\n"); infof(data, "Server doesn't support multiplex yet, wait\n");
*waitpipe = TRUE; *waitpipe = TRUE;
@ -1047,6 +1047,10 @@ ConnectionExists(struct Curl_easy *data,
infof(data, "Could multiplex, but not asked to!\n"); infof(data, "Could multiplex, but not asked to!\n");
canmultiplex = FALSE; canmultiplex = FALSE;
} }
if(bundle->multiuse == BUNDLE_NO_MULTIUSE) {
infof(data, "Can not multiplex, even if we wanted to!\n");
canmultiplex = FALSE;
}
} }
curr = bundle->conn_list.head; curr = bundle->conn_list.head;
@ -1071,7 +1075,8 @@ ConnectionExists(struct Curl_easy *data,
continue; continue;
} }
multiplexed = CONN_INUSE(check); multiplexed = CONN_INUSE(check) &&
(bundle->multiuse == BUNDLE_MULTIPLEX);
if(canmultiplex) { if(canmultiplex) {
if(check->bits.protoconnstart && check->bits.close) if(check->bits.protoconnstart && check->bits.close)