mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

http2: leave WAITPERFORM when conn is multiplexed

Browse Source 
No need to wait for our "spot" like for pipelining
This commit is contained in:
Daniel Stenberg 2015-04-30 15:25:06 +02:00
parent 01e1bdb10c
commit f4b8b39881
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/http2.c
View File

@ -1120,6 +1120,7 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
httpc->upload_mem = NULL; httpc->upload_mem = NULL;
httpc->upload_len = 0; httpc->upload_len = 0;
conn->bits.multiplex = TRUE; /* at least potentially multiplexed */
conn->httpversion = 20; conn->httpversion = 20;
conn->bundle->server_supports_pipelining = TRUE; conn->bundle->server_supports_pipelining = TRUE;

7
lib/multi.c
View File

@ -1429,9 +1429,10 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
case CURLM_STATE_WAITPERFORM: case CURLM_STATE_WAITPERFORM:
/* Wait for our turn to PERFORM */ /* Wait for our turn to PERFORM */
if(!data->easy_conn->readchannel_inuse && if((!data->easy_conn->readchannel_inuse &&
isHandleAtHead(data, isHandleAtHead(data,
data->easy_conn->recv_pipe)) { data->easy_conn->recv_pipe)) ||
data->easy_conn->bits.multiplex) {
/* Grab the channel */ /* Grab the channel */
data->easy_conn->readchannel_inuse = TRUE; data->easy_conn->readchannel_inuse = TRUE;
multistate(data, CURLM_STATE_PERFORM); multistate(data, CURLM_STATE_PERFORM);

1
lib/urldata.h
View File

@ -530,6 +530,7 @@ struct ConnectBits {
bool bound; /* set true if bind() has already been done on this socket/ bool bound; /* set true if bind() has already been done on this socket/
connection */ connection */
bool type_set; /* type= was used in the URL */ bool type_set; /* type= was used in the URL */
bool multiplex; /* connection is multiplexed */
}; };
struct hostname { struct hostname {