Author: Alex Rousskov <rousskov@measurement-factory.com>

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 04b5bd9f1143c2f2316214781b6178e8b824ed1f..a25cbddf8884850b91100816e9380828abf340ed 100644 (file)
--- 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;
 }