[trafficserver] branch 8.1.x updated: Remove the ignore_keep_alive method entirely

[zwoop]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.1.x by this push:
     new 6b383ea  Remove the ignore_keep_alive method entirely
6b383ea is described below

commit 6b383eaa0f3542fbfbacc263b1e6de4c62535c30
Author: Susan Hinrichs <shinr...@oath.com>
AuthorDate: Thu Aug 2 13:44:54 2018 +0000

    Remove the ignore_keep_alive method entirely
    
    (cherry picked from commit da9edd5feba06da6ebbe47eaf9696c37c5483fa1)
    
     Conflicts:
        proxy/http2/Http2Stream.h
---
 proxy/ProxyClientTransaction.h      | 6 ------
 proxy/http/Http1ClientTransaction.h | 6 ------
 proxy/http/HttpTransact.cc          | 2 +-
 proxy/http2/Http2Stream.h           | 9 ---------
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index 560c5c6..5d7e071 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -196,12 +196,6 @@ public:
   {
   }
 
-  virtual bool
-  ignore_keep_alive()
-  {
-    return true;
-  }
-
   virtual void destroy();
 
   virtual void transaction_done() = 0;
diff --git a/proxy/http/Http1ClientTransaction.h 
b/proxy/http/Http1ClientTransaction.h
index 0251b2c..8a87666 100644
--- a/proxy/http/Http1ClientTransaction.h
+++ b/proxy/http/Http1ClientTransaction.h
@@ -81,12 +81,6 @@ public:
 
   void release(IOBufferReader *r) override;
 
-  bool
-  ignore_keep_alive() override
-  {
-    return false;
-  }
-
   bool allow_half_open() const override;
 
   void set_parent(ProxyClientSession *new_parent) override;
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index cebef72..40ff061 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -5480,7 +5480,7 @@ 
HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
   }
 
   // If this is an internal request, never keep alive
-  if (!s->txn_conf->keep_alive_enabled_in || (s->state_machine->ua_txn && 
s->state_machine->ua_txn->ignore_keep_alive())) {
+  if (!s->txn_conf->keep_alive_enabled_in) {
     s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
   } else if (vc && vc->get_is_internal_request()) {
     // Following the trail of JIRAs back from TS-4960, there can be issues with
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index fc52cf3..779d69a 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -101,7 +101,6 @@ public:
   int get_transaction_id() const override;
   int get_transaction_priority_weight() const override;
   int get_transaction_priority_dependence() const override;
-  bool ignore_keep_alive() override;
 
   void clear_inactive_timer();
   void clear_active_timer();
@@ -298,14 +297,6 @@ Http2Stream::payload_length_is_valid() const
 }
 
 inline bool
-Http2Stream::ignore_keep_alive()
-{
-  // If we return true here, Connection header will always be "close".
-  // It should be handled as the same as HTTP/1.1
-  return false;
-}
-
-inline bool
 Http2Stream::allow_half_open() const
 {
   return false;