http2: leave WAITPERFORM when conn is multiplexed
No need to wait for our "spot" like for pipelining
This commit is contained in:
Родитель
01e1bdb10c
Коммит
f4b8b39881
|
@ -1120,6 +1120,7 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
|
|||
httpc->upload_mem = NULL;
|
||||
httpc->upload_len = 0;
|
||||
|
||||
conn->bits.multiplex = TRUE; /* at least potentially multiplexed */
|
||||
conn->httpversion = 20;
|
||||
conn->bundle->server_supports_pipelining = TRUE;
|
||||
|
||||
|
|
|
@ -1429,9 +1429,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);
|
||||
|
|
|
@ -530,6 +530,7 @@ struct ConnectBits {
|
|||
bool bound; /* set true if bind() has already been done on this socket/
|
||||
connection */
|
||||
bool type_set; /* type= was used in the URL */
|
||||
bool multiplex; /* connection is multiplexed */
|
||||
};
|
||||
|
||||
struct hostname {
|
||||
|
|
Загрузка…
Ссылка в новой задаче