diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-05-08 10:43:36 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-05-18 08:57:18 +0200 |
| commit | 02ec1ced9ba3bf70f6198b39c39b15fc80c97f09 (patch) | |
| tree | 8fd01a81dcdca7045527a97db9af3a04e5c761f7 /lib/sendf.c | |
| parent | 2ce2f03007cca9e3d8cc1b481ae7c4489c111741 (diff) | |
CURLMOPT_PIPELINE: bit 1 is for multiplexing
Diffstat (limited to 'lib/sendf.c')
| -rw-r--r-- | lib/sendf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sendf.c b/lib/sendf.c index 71b2d6030..5f39d1f2d 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -551,8 +551,7 @@ CURLcode Curl_read(struct connectdata *conn, /* connection data */ ssize_t nread = 0; size_t bytesfromsocket = 0; char *buffertofill = NULL; - bool pipelining = Curl_multi_pipeline_enabled(conn->data->multi) && - !conn->bits.multiplex; + bool pipelining = Curl_pipeline_wanted(conn->data->multi, CURLPIPE_HTTP1); /* Set 'num' to 0 or 1, depending on which socket that has been sent here. If it is the second socket, we set num to 1. Otherwise to 0. This lets |