From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 5 Sep 2018 12:35:57 +0000 (+0200)
Subject: multiplex: enable by default
X-Git-Tag: curl-7_62_0~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7c4213bd0cfd16054fa75a887d3e1a9a796cb53;p=thirdparty%2Fcurl.git

multiplex: enable by default

Starting 7.62.0, multiplexing is enabled by default in multi handles.
---

diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING.3
index a44294d552..187338a91f 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 2b2ff70497..9d5afc0932 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;