Skip to content

Commit

Permalink
HTTP: don't switch to HTTP/2 from 1.1 until we get the 101
Browse files Browse the repository at this point in the history
We prematurely changed protocol handler to HTTP/2 which made things very
slow (and wrong).

Reported-by: Stefan Eissing
Bug: #169
  • Loading branch information
bagder committed Mar 19, 2015
1 parent 9e66d3f commit abfab17
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/http2.c
Expand Up @@ -640,10 +640,6 @@ CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,
if(result)
return result;

result = Curl_http2_setup(conn);
if(result)
return result;

/* As long as we have a fixed set of settings, we don't have to dynamically
* figure out the base64 strings since it'll always be the same. However,
* the settings will likely not be fixed every time in the future.
Expand Down Expand Up @@ -1011,6 +1007,10 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
int rv;
struct SessionHandle *data = conn->data;

result = Curl_http2_setup(conn);
if(result)
return result;

httpc->recv_underlying = (recving)conn->recv[FIRSTSOCKET];
httpc->send_underlying = (sending)conn->send[FIRSTSOCKET];
conn->recv[FIRSTSOCKET] = http2_recv;
Expand Down

0 comments on commit abfab17

Please sign in to comment.