Commit f4b8b398 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http2: leave WAITPERFORM when conn is multiplexed 

No need to wait for our "spot" like for pipelining
parent 01e1bdb1

lib/http2.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

lib/multi.c

+4 −3
Original line number Diff line number Diff line
@@ -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 &&

      if((!data->easy_conn->readchannel_inuse &&

          isHandleAtHead(data,

                        data->easy_conn->recv_pipe)) {

                         data->easy_conn->recv_pipe)) ||

         data->easy_conn->bits.multiplex) {

        /* Grab the channel */

        data->easy_conn->readchannel_inuse = TRUE;

        multistate(data, CURLM_STATE_PERFORM);

lib/urldata.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {