aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-12-18 14:03:36 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-12-19 09:00:56 +0100
commit8c0807aa161d791fa94da2e19e46b8cf845fd5d1 (patch)
treebc26c6f8edab56cb3bd777bc40c5835bbcd5ee40
parentfba830133899ae50071b5fc9359a621694d24748 (diff)
create_conn: prefer multiplexing to using new connections
... as it would previously prefer new connections rather than multiplexing in most conditions! The (now removed) code was a leftover from the Pipelining code that was translated wrongly into a multiplex-only world. Reported-by: Kunal Ekawde Bug: https://curl.haxx.se/mail/lib-2019-12/0060.html Closes #4732
-rw-r--r--lib/url.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/url.c b/lib/url.c
index 4111eec3a..56fb73636 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3594,24 +3594,6 @@ static CURLcode create_conn(struct Curl_easy *data,
else
reuse = ConnectionExists(data, conn, &conn_temp, &force_reuse, &waitpipe);
- /* If we found a reusable connection that is now marked as in use, we may
- still want to open a new connection if we are multiplexing. */
- if(reuse && !force_reuse && IsMultiplexingPossible(data, conn_temp)) {
- size_t multiplexed = CONN_INUSE(conn_temp);
- if(multiplexed > 0) {
- infof(data, "Found connection %ld, with %zu requests on it\n",
- conn_temp->connection_id, multiplexed);
-
- if(Curl_conncache_bundle_size(conn_temp) < max_host_connections &&
- Curl_conncache_size(data) < max_total_connections) {
- /* We want a new connection anyway */
- reuse = FALSE;
-
- infof(data, "We can reuse, but we want a new connection anyway\n");
- }
- }
- }
-
if(reuse) {
/*
* We already have a connection for this, we got the former connection