romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 04:23:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

bundles: store no/default/pipeline/multiplex

Browse source 
to allow code to act differently on the situation.

Also added some more info message for the connection re-use function to
make it clearer when connections are not re-used.
This commit is contained in:
Daniel Stenberg 2015-05-18 08:56:29 +02:00
parent be4c8fd1ef
commit 38bd6bf0bb
7 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/http.c
View file

@ -3375,7 +3375,7 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
/* HTTP/2 cannot blacklist multiplexing since it is a core
functionality of the protocol */
conn->bundle->server_supports_pipelining = TRUE;
conn->bundle->multiuse = BUNDLE_MULTIPLEX;
}
else if(conn->httpversion >= 11 &&
!conn->bits.close) {
@ -3390,7 +3390,7 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
cb_ptr = conn->bundle;
if(cb_ptr) {
if(!Curl_pipeline_site_blacklisted(data, conn))
cb_ptr->server_supports_pipelining = TRUE;
cb_ptr->multiuse = BUNDLE_PIPELINING;
}
}
@ -3474,9 +3474,9 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
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(conn->bundle && (conn->bundle->multiuse == BUNDLE_PIPELINING)) {
if(Curl_pipeline_server_blacklisted(data, server_name))
conn->bundle->server_supports_pipelining = FALSE;
conn->bundle->multiuse = BUNDLE_NO_MULTIUSE;
}
free(server_name);
}