You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by wb...@apache.org on 2015/01/29 20:53:24 UTC
trafficserver git commit: TS-3343 outbound transparent can end up
with Connection: keep-alive headers on failures
Repository: trafficserver
Updated Branches:
refs/heads/master c9339f925 -> de7a7b41e
TS-3343 outbound transparent can end up with Connection: keep-alive headers on failures
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/de7a7b41
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/de7a7b41
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/de7a7b41
Branch: refs/heads/master
Commit: de7a7b41edcd82c36624de26bfa2426fd4fe1eba
Parents: c9339f9
Author: William Bardwell <wb...@apache.org>
Authored: Thu Jan 29 14:50:01 2015 -0500
Committer: William Bardwell <wb...@apache.org>
Committed: Thu Jan 29 14:52:53 2015 -0500
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/InkAPI.cc | 4 ----
proxy/http/HttpTransact.cc | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/de7a7b41/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index bfcdd7a..e5cf274 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3343] outbound transparent can end up with Connection: keep-alive headers on failures
+
*) [TS-3344] 401 responses invalidate cache entry even if TSHttpTxnServerRespIgnore() used
*) [TS-3339] Multithread access to PluginVC can cause crash due to unprotected check of shutdown/close
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/de7a7b41/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 2f929dd..d906a80 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -5340,10 +5340,6 @@ TSHttpTxnOutgoingTransparencySet(TSHttpTxn txnp, int flag)
{
if (TS_SUCCESS != sdk_sanity_check_txn(txnp)) return TS_ERROR;
-# if ! TS_USE_TPROXY
- if (flag) return TS_ERROR; // can't enable if it's not configured.
-# endif
-
HttpSM *sm = reinterpret_cast<HttpSM*>(txnp);
if (NULL == sm || NULL == sm->ua_session) {
return TS_ERROR;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/de7a7b41/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index f330d4e..3bd3af5 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7925,7 +7925,8 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
//////////////////////////////////////////////////////
if (status_code == HTTP_STATUS_REQUEST_TIMEOUT ||
s->hdr_info.client_request.get_content_length() != 0 ||
- s->client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING) {
+ s->client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING ||
+ s->state_machine->ua_session->f_outbound_transparent) {
s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
} else {
// We don't have a request body. Since we are