aboutsummaryrefslogtreecommitdiff
path: root/lib/http.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-05-18 08:56:29 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-05-18 09:33:36 +0200
commit38bd6bf0bb4ffc031c8d810f103d6ec1bc7fbb90 (patch)
tree54cb3a02e93e86065a7d4854cc0441c18ac4083c /lib/http.c
parentbe4c8fd1ef11a565fcfceed48d40aa9889f095d4 (diff)
bundles: store no/default/pipeline/multiplex
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.
Diffstat (limited to 'lib/http.c')
-rw-r--r--lib/http.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/http.c b/lib/http.c
index 6d11c288b..28da5c47b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -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);
}