From: Amos Jeffries Date: Thu, 19 Aug 2010 02:27:34 +0000 (-0600) Subject: Author: Alex Rousskov X-Git-Tag: SQUID_3_1_7~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4afe4d70b5a561aede6d7dcdcde8fa86e379aa7;p=thirdparty%2Fsquid.git Author: Alex Rousskov Bug 3016: HTTP/1.1 compliance: default keep-alive for 1.0/1.1 clients. aka. NTLM Authentication with Java UA + SSL Problem Moved httpMsgIsPersistent(version, headers) to HttpMsg::persistent(void). This move makes it clear that the logic applies only to the message being examined and not some irrelevant information such as HTTP version supported by Squid. Side-effects: * Squid starts using persistent connections with HTTP/1.1 clients that do not send "Connection: close". --- diff --git a/src/client_side.cc b/src/client_side.cc index 04b5bd9f11..a25cbddf88 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -704,10 +704,7 @@ clientSetKeepaliveFlag(ClientHttpRequest * http) debugs(33, 3, "clientSetKeepaliveFlag: method = " << RequestMethodStr(request->method)); - /* We are HTTP/1.0 facing clients still */ - HttpVersion http_ver(1,0); - - if (httpMsgIsPersistent(http_ver, req_hdr)) + if (httpMsgIsPersistent(request->http_ver, req_hdr)) request->flags.proxy_keepalive = 1; }