------------------------------------------------------------ revno: 10728 revision-id: squid3@treenet.co.nz-20100812093714-18i9dlc7uigthwom parent: kinkie@squid-cache.org-20100811201624-ypzj2hxlfanycbcb committer: Amos Jeffries branch nick: trunk timestamp: Thu 2010-08-12 21:37:14 +1200 message: Author: Stephen Thorne Bug 2936: NTLM-Authenticate 407 and Proxy-Connection: Close in same response. Squid default from the days of HTTP/1.0 was to close connections unless keep-alive was explicitly known. This changes the default to send keep-alive unless we have a good reason to close. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20100812093714-18i9dlc7uigthwom # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: da7ec50ad7e4037f285a66de125e49426b10c9e1 # timestamp: 2010-08-12 09:52:24 +0000 # source_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20100811201624-\ # ypzj2hxlfanycbcb # # Begin patch === modified file 'src/client_side_reply.cc' --- src/client_side_reply.cc 2010-07-13 14:27:25 +0000 +++ src/client_side_reply.cc 2010-08-12 09:37:14 +0000 @@ -1383,6 +1383,9 @@ } else if (fdUsageHigh()&& !request->flags.must_keepalive) { debugs(88, 3, "clientBuildReplyHeader: Not many unused FDs, can't keep-alive"); request->flags.proxy_keepalive = 0; + } else if (request->http_ver.major == 1 && request->http_ver.minor == 1) { + debugs(88, 3, "clientBuildReplyHeader: Client is HTTP/1.1, send keep-alive, no overriding reasons not to"); + request->flags.proxy_keepalive = 1; }