From d7c4213bd0cfd16054fa75a887d3e1a9a796cb53 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 5 Sep 2018 14:35:57 +0200 Subject: [PATCH] multiplex: enable by default Starting 7.62.0, multiplexing is enabled by default in multi handles. --- docs/libcurl/opts/CURLMOPT_PIPELINING.3 | 4 +++- lib/multi.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING.3 index a44294d5527c06..187338a91f4665 100644 --- a/docs/libcurl/opts/CURLMOPT_PIPELINING.3 +++ b/docs/libcurl/opts/CURLMOPT_PIPELINING.3 @@ -63,7 +63,9 @@ This bit is deprecated and has no effect since version 7.62.0. If this bit is set, libcurl will try to multiplex the new transfer over an existing connection if possible. This requires HTTP/2. .SH DEFAULT -0 (both pipeline and multiplexing are off) +Since 7.62.0, \fBCURLPIPE_MULTIPLEX\bP is enabled by default. + +Before that, default was \fBCURLPIPE_NOTHING\fP. .SH PROTOCOLS HTTP(S) .SH EXAMPLE diff --git a/lib/multi.c b/lib/multi.c index 2b2ff7049777a7..9d5afc0932f75d 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -347,6 +347,7 @@ struct Curl_multi *Curl_multi_handle(int hashsize, /* socket hash */ Curl_llist_init(&multi->pending, multi_freeamsg); multi->max_pipeline_length = 5; + multi->pipelining = CURLPIPE_MULTIPLEX; /* -1 means it not set by user, use the default value */ multi->maxconnects = -1;