diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-04-30 15:25:06 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-04-30 15:25:06 +0200 |
| commit | b33137b340565f5af7434b82ac21489ac3f15abd (patch) | |
| tree | cf67173f30ebaec2788c9e7db4cc3432d7a42d89 /lib/multi.c | |
| parent | ae5c2242af68066177ff58df4bf7f7be2791528c (diff) | |
| download | curl-b33137b340565f5af7434b82ac21489ac3f15abd.tar.gz | |
http2: leave WAITPERFORM when conn is multiplexed
No need to wait for our "spot" like for pipelining
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/multi.c b/lib/multi.c index 1ba40c25a..4ec26ad4e 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1437,9 +1437,10 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, case CURLM_STATE_WAITPERFORM: /* Wait for our turn to PERFORM */ - if(!data->easy_conn->readchannel_inuse && - isHandleAtHead(data, - data->easy_conn->recv_pipe)) { + if((!data->easy_conn->readchannel_inuse && + isHandleAtHead(data, + data->easy_conn->recv_pipe)) || + data->easy_conn->bits.multiplex) { /* Grab the channel */ data->easy_conn->readchannel_inuse = TRUE; multistate(data, CURLM_STATE_PERFORM); |