summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-09-05 14:35:57 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-09-05 14:35:57 +0200
commitd7c4213bd0cfd16054fa75a887d3e1a9a796cb53 (patch)
tree4d7b1c9e25c2d9326472a335f6698b9f1c0a0f3d
parentb004a174ea5efb3d6bdce83949b6c1eab994930b (diff)
downloadcurl-d7c4213bd0cfd16054fa75a887d3e1a9a796cb53.tar.gz
multiplex: enable by default
Starting 7.62.0, multiplexing is enabled by default in multi handles.
-rw-r--r--docs/libcurl/opts/CURLMOPT_PIPELINING.34
-rw-r--r--lib/multi.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING.3
index a44294d55..187338a91 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 2b2ff7049..9d5afc093 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;