------------------------------------------------------------
revno: 10739
revision-id: amosjeffries@squid-cache.org-20100814025839-n64w74nak5yukg2p
parent: squid3@treenet.co.nz-20100814021028-10ml7g4hsl8ydwp9
committer: Amos Jeffries <amosjeffries@squid-cache.org>
branch nick: trunk
timestamp: Fri 2010-08-13 20:58:39 -0600
message:
  Revert revno10728 (bug 2396)
  
  Vetoed by Alex Rousskov.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: amosjeffries@squid-cache.org-20100814025839-\
#   n64w74nak5yukg2p
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 4eafb190994829155baa0d2fdcc5bc6f32f0e5a3
# timestamp: 2010-08-14 03:51:59 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20100814021028-\
#   10ml7g4hsl8ydwp9
# 
# Begin patch
=== modified file 'src/client_side_reply.cc'
--- src/client_side_reply.cc	2010-08-13 07:53:08 +0000
+++ src/client_side_reply.cc	2010-08-14 02:58:39 +0000
@@ -1383,9 +1383,6 @@
     } 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;
     }