summaryrefslogtreecommitdiff
path: root/lib/http2.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-01-05 10:34:19 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-01-09 09:05:36 +0100
commitf24d92fd54e1ce577251479613d9d574f8e3a958 (patch)
treec8ba6db8c29251197a1fffd033c8616f5b61a474 /lib/http2.c
parent5059f5552f7759477eb5ea8e26ce99b556c684c2 (diff)
downloadcurl-f24d92fd54e1ce577251479613d9d574f8e3a958.tar.gz
ConnectionExists: respect the max_concurrent_streams limitsbagder/max_concurrent_streams
A regression made the code use 'multiplexed' as a boolean instead of the counter it is intended to be. Also, respect the CURLMOPT_MAX_CONCURRENT_STREAMS value in the same check. Reported-by: Kunal Ekawde Fixes #4779
Diffstat (limited to 'lib/http2.c')
-rw-r--r--lib/http2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/http2.c b/lib/http2.c
index 65f3513ee..690a537bf 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1158,7 +1158,7 @@ static void populate_settings(struct connectdata *conn,
nghttp2_settings_entry *iv = httpc->local_settings;
iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
- iv[0].value = (uint32_t)Curl_multi_max_concurrent_streams(conn->data->multi);
+ iv[0].value = Curl_multi_max_concurrent_streams(conn->data->multi);
iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
iv[1].value = HTTP2_HUGE_WINDOW_SIZE;