From commits-return-13239-apmail-trafficserver-commits-archive=trafficserver.apache.org@trafficserver.apache.org Mon Mar 16 15:49:58 2015 Return-Path: X-Original-To: apmail-trafficserver-commits-archive@www.apache.org Delivered-To: apmail-trafficserver-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA718102E3 for ; Mon, 16 Mar 2015 15:49:57 +0000 (UTC) Received: (qmail 79297 invoked by uid 500); 16 Mar 2015 15:49:57 -0000 Delivered-To: apmail-trafficserver-commits-archive@trafficserver.apache.org Received: (qmail 79204 invoked by uid 500); 16 Mar 2015 15:49:57 -0000 Mailing-List: contact commits-help@trafficserver.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@trafficserver.apache.org Delivered-To: mailing list commits@trafficserver.apache.org Received: (qmail 78972 invoked by uid 99); 16 Mar 2015 15:49:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2015 15:49:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89C50E10BE; Mon, 16 Mar 2015 15:49:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zwoop@apache.org To: commits@trafficserver.apache.org Date: Mon, 16 Mar 2015 15:50:01 -0000 Message-Id: <4858052edbf145f0a455c5feced89d06@git.apache.org> In-Reply-To: <54486d3907324d77962cb6cfcca3b0cc@git.apache.org> References: <54486d3907324d77962cb6cfcca3b0cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] trafficserver git commit: TS-3439: Chunked responses don't honor keep-alive TS-3439: Chunked responses don't honor keep-alive Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/32b46b94 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/32b46b94 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/32b46b94 Branch: refs/heads/5.2.x Commit: 32b46b94d0c78bbebbcddf86493efb84b8d868a8 Parents: 4222257 Author: Brian Geffon Authored: Fri Mar 13 15:52:06 2015 -0700 Committer: Leif Hedstrom Committed: Mon Mar 16 09:35:15 2015 -0600 ---------------------------------------------------------------------- proxy/http/HttpSM.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/32b46b94/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index f7ad2ce..1c83409 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -2877,7 +2877,8 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer * p) bool close_connection = false; if (t_state.current.server->keep_alive == HTTP_KEEPALIVE && - server_entry->eos == false && plugin_tunnel_type == HTTP_NO_PLUGIN_TUNNEL) { + server_entry->eos == false && plugin_tunnel_type == HTTP_NO_PLUGIN_TUNNEL && + t_state.txn_conf->keep_alive_enabled_out == 1) { close_connection = false; } else { close_connection = true;