trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch master updated: Revert "Two more places to check whether attempting half_closed connection logic is feasible."
Date Tue, 18 Dec 2018 20:06:29 GMT
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new f6fe5f0  Revert "Two more places to check whether attempting half_closed connection
logic is feasible."
f6fe5f0 is described below

commit f6fe5f0079005813d33d1cddd9d127c75a1f5e0b
Author: Susan Hinrichs <shinrich@oath.com>
AuthorDate: Tue Dec 18 16:00:40 2018 +0000

    Revert "Two more places to check whether attempting half_closed connection logic is feasible."
    
    This reverts commit 653927f9aab9a3cbe8f09521dd8c8154ccbc1614.
    
    Erroneous fix caused KEEPALIVE to fail on HTTP/1.1 over HTTPS
---
 proxy/ProxyClientSession.cc | 3 +--
 proxy/http/HttpSM.cc        | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/proxy/ProxyClientSession.cc b/proxy/ProxyClientSession.cc
index 0c71d12..2307779 100644
--- a/proxy/ProxyClientSession.cc
+++ b/proxy/ProxyClientSession.cc
@@ -202,8 +202,7 @@ ProxyClientSession::handle_api_return(int event)
     break;
   }
   default:
-    Error("received invalid session hook %s (%d)", HttpDebugNames::get_api_hook_name(hookid),
hookid);
-    ink_release_assert(false);
+    Fatal("received invalid session hook %s (%d)", HttpDebugNames::get_api_hook_name(hookid),
hookid);
     break;
   }
 }
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 435da94..b372dd3 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3241,8 +3241,7 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
     c->write_success          = true;
     t_state.client_info.abort = HttpTransact::DIDNOT_ABORT;
     if (t_state.client_info.keep_alive == HTTP_KEEPALIVE) {
-      if (ua_txn->allow_half_open() &&
-          (t_state.www_auth_content != HttpTransact::CACHE_AUTH_SERVE || ua_txn->get_server_session()))
{
+      if (t_state.www_auth_content != HttpTransact::CACHE_AUTH_SERVE || ua_txn->get_server_session())
{
         // successful keep-alive
         close_connection = false;
       }
@@ -3303,8 +3302,8 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
         is_eligible_post_request &= !vc->get_is_internal_request();
       }
     }
-    if ((is_eligible_post_request || t_state.client_info.pipeline_possible == true) &&
ua_txn->allow_half_open() &&
-        c->producer->vc_type != HT_STATIC && event == VC_EVENT_WRITE_COMPLETE)
{
+    if ((is_eligible_post_request || t_state.client_info.pipeline_possible == true) &&
c->producer->vc_type != HT_STATIC &&
+        event == VC_EVENT_WRITE_COMPLETE) {
       ua_txn->set_half_close_flag(true);
     }
 


Mime
View raw message