From 885b094ac11018b6b79a0706687784c02249fa9a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 30 Apr 2019 11:16:53 +0200 Subject: ConnectionExists: improve non-multiplexing use case - better log output - make sure multiplex is enabled for it to be used --- lib/url.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/url.c b/lib/url.c index ad8aa6996..5b3ce11f2 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1031,7 +1031,7 @@ ConnectionExists(struct Curl_easy *data, /* We can't multiplex if we don't know anything about the server */ if(canmultiplex) { - if(bundle->multiuse <= BUNDLE_UNKNOWN) { + if(bundle->multiuse == BUNDLE_UNKNOWN) { if((bundle->multiuse == BUNDLE_UNKNOWN) && data->set.pipewait) { infof(data, "Server doesn't support multiplex yet, wait\n"); *waitpipe = TRUE; @@ -1047,6 +1047,10 @@ ConnectionExists(struct Curl_easy *data, infof(data, "Could multiplex, but not asked to!\n"); 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; @@ -1071,7 +1075,8 @@ ConnectionExists(struct Curl_easy *data, continue; } - multiplexed = CONN_INUSE(check); + multiplexed = CONN_INUSE(check) && + (bundle->multiuse == BUNDLE_MULTIPLEX); if(canmultiplex) { if(check->bits.protoconnstart && check->bits.close) -- cgit v1.2.1