generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Curl_http2_setup: only do it once and enable multiplex on the server

Browse Source 
Once we know we are HTTP/2 enabled we know the server can multiplex.
This commit is contained in:
Daniel Stenberg
2015-04-27 12:52:07 +02:00
parent 6e6b02f398
commit f858624052
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/http2.c
View File

@@ -32,6 +32,7 @@
#include "curl_base64.h" #include "curl_base64.h"
#include "rawstr.h" #include "rawstr.h"
#include "multiif.h" #include "multiif.h"
#include "bundles.h"
/* The last #include files should be: */ /* The last #include files should be: */
#include "curl_memory.h" #include "curl_memory.h"
@@ -972,6 +973,11 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
{ {
CURLcode result; CURLcode result;
struct http_conn *httpc = &conn->proto.httpc; struct http_conn *httpc = &conn->proto.httpc;
if((conn->handler == &Curl_handler_http2_ssl) ||
(conn->handler == &Curl_handler_http2))
return CURLE_OK; /* already done */
if(conn->handler->flags & PROTOPT_SSL) if(conn->handler->flags & PROTOPT_SSL)
conn->handler = &Curl_handler_http2_ssl; conn->handler = &Curl_handler_http2_ssl;
else else
@@ -981,7 +987,7 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
if(result) if(result)
return result; return result;
infof(conn->data, "Using HTTP2\n"); infof(conn->data, "Using HTTP2, server supports multi-use\n");
httpc->bodystarted = FALSE; httpc->bodystarted = FALSE;
httpc->error_code = NGHTTP2_NO_ERROR; httpc->error_code = NGHTTP2_NO_ERROR;
httpc->closed = FALSE; httpc->closed = FALSE;
@@ -996,6 +1002,7 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
httpc->status_code = -1; httpc->status_code = -1;
conn->httpversion = 20; conn->httpversion = 20;
conn->bundle->server_supports_pipelining = TRUE;
return CURLE_OK; return CURLE_OK;
} }