diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-04-27 12:51:29 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-05-18 08:54:54 +0200 |
| commit | 6e6b02f398091140a9841fb0e9f9566a8905a1b8 (patch) | |
| tree | 1d75610641f10cdcccafa2524f1f5e1c1f94a3bb /lib/http.c | |
| parent | 5fa82ca56f005e4c712221aafaa0b61b5a3f4d82 (diff) | |
http: switch on "pipelining" (multiplexing) for HTTP/2 servers
... and do not blacklist any.
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/lib/http.c b/lib/http.c index 4e629be32..b1e555cf6 100644 --- a/lib/http.c +++ b/lib/http.c @@ -3332,13 +3332,11 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, } else if(conn->httpversion == 20 || (k->upgr101 == UPGR101_REQUESTED && k->httpcode == 101)) { - /* Don't enable pipelining for HTTP/2 or upgraded connection. For - HTTP/2, we do not support multiplexing. In general, requests - cannot be pipelined in upgraded connection, since it is now - different protocol. */ - DEBUGF(infof(data, - "HTTP 2 or upgraded connection do not support " - "pipelining for now\n")); + DEBUGF(infof(data, "HTTP/2 found, allow multiplexing\n")); + + /* HTTP/2 cannot blacklist multiplexing since it is a core + functionality of the protocol */ + conn->bundle->server_supports_pipelining = TRUE; } else if(conn->httpversion >= 11 && !conn->bits.close) { @@ -3432,14 +3430,17 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, } } else if(checkprefix("Server:", k->p)) { - char *server_name = Curl_copy_header_value(k->p); - - /* Turn off pipelining if the server version is blacklisted */ - if(conn->bundle && conn->bundle->server_supports_pipelining) { - if(Curl_pipeline_server_blacklisted(data, server_name)) - conn->bundle->server_supports_pipelining = FALSE; + if(conn->httpversion < 20) { + /* only do this for non-h2 servers */ + char *server_name = Curl_copy_header_value(k->p); + + /* Turn off pipelining if the server version is blacklisted */ + if(conn->bundle && conn->bundle->server_supports_pipelining) { + if(Curl_pipeline_server_blacklisted(data, server_name)) + conn->bundle->server_supports_pipelining = FALSE; + } + free(server_name); } - free(server_name); } else if((conn->httpversion == 10) && conn->bits.httpproxy && |