trafficserver git commit: Revert "TS-3343 outbound transparent can end up with Connection: keep-alive headers on failures"

[zwoop]

Repository: trafficserver
Updated Branches:
  refs/heads/master d37199709 -> 5cfbc2ec8


Revert "TS-3343 outbound transparent can end up with Connection: keep-alive 
headers on failures"

This reverts commit de7a7b41edcd82c36624de26bfa2426fd4fe1eba.

Conflicts:
        CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5cfbc2ec
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5cfbc2ec
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5cfbc2ec

Branch: refs/heads/master
Commit: 5cfbc2ec82322f15b7f9e2d964de290dc57a00d1
Parents: d371997
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jan 29 19:06:31 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jan 29 19:06:31 2015 -0700

----------------------------------------------------------------------
 CHANGES                    | 2 --
 proxy/InkAPI.cc            | 4 ++++
 proxy/http/HttpTransact.cc | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cfbc2ec/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c45c471..4353c8f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,6 @@ Changes with Apache Traffic Server 5.3.0
 
   *) [TS-3349] Add DscpSet API's.
 
-  *) [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/5cfbc2ec/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index efd6572..9c9f32f 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -5340,6 +5340,10 @@ 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/5cfbc2ec/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index eaa3a89..7189ed2 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7926,8 +7926,7 @@ 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->state_machine->ua_session->f_outbound_transparent) {
+      s->client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING) {
     s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
   } else {
     // We don't have a request body.  Since we are