aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-05-04 10:03:07 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-05-18 08:57:18 +0200
commit5252f13dfaa6c006f085450813104e285c01ee28 (patch)
tree14c94693c558a2af7c3008c32780e86ed9d0a881 /lib
parent153f9401983ed6a0eb8ac365c79ad668858182d2 (diff)
http2: Curl_read should not use the single buffer
... as it does for pipelining when we're multiplexing, as we need the different buffers to store incoming data correctly for all streams.
Diffstat (limited to 'lib')
-rw-r--r--lib/sendf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sendf.c b/lib/sendf.c
index 879e08292..71b2d6030 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -551,7 +551,8 @@ 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);
+ bool pipelining = Curl_multi_pipeline_enabled(conn->data->multi) &&
+ !conn->bits.multiplex;
/* 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