[trafficserver] branch master updated: TS-4455: remove eosRcvd and isEosRcvd(). This closes #646.

[sh...@apache.org]

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

shinrich pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  f789a5f   TS-4455: remove eosRcvd and isEosRcvd().  This closes #646.
f789a5f is described below

commit f789a5f9923645b0abfbf1089f26987430284503
Author: Oknet <xu...@gmail.com>
AuthorDate: Wed May 18 19:48:34 2016 +0800

    TS-4455: remove eosRcvd and isEosRcvd().  This closes #646.
---
 iocore/net/P_SSLNetVConnection.h | 7 -------
 iocore/net/SSLNetVConnection.cc  | 3 ---
 proxy/http/HttpSM.cc             | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 543700d..a4ae8b3 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -228,12 +228,6 @@ public:
   // least some of the hooks
   bool calledHooks(TSHttpHookID /* eventId */) { return (this->sslHandshakeHookState != HANDSHAKE_HOOKS_PRE); }
   bool
-  isEosRcvd()
-  {
-    return eosRcvd;
-  }
-
-  bool
   getSSLTrace() const
   {
     return sslTrace || super::origin_trace;
@@ -308,7 +302,6 @@ private:
   const SSLNextProtocolSet *npnSet;
   Continuation *npnEndpoint;
   SessionAccept *sessionAcceptPtr;
-  bool eosRcvd;
   bool sslTrace;
 };
 
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index cffe487..27dc985 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -625,7 +625,6 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
     // close the connection if we have SSL_READ_EOS, this is the return value from ssl_read_from_net() if we get an
     // SSL_ERROR_ZERO_RETURN from SSL_get_error()
     // SSL_ERROR_ZERO_RETURN means that the origin server closed the SSL connection
-    eosRcvd = true;
     read.triggered = 0;
     readSignalDone(VC_EVENT_EOS, nh);
 
@@ -836,7 +835,6 @@ SSLNetVConnection::SSLNetVConnection()
     npnSet(NULL),
     npnEndpoint(NULL),
     sessionAcceptPtr(NULL),
-    eosRcvd(false),
     sslTrace(false)
 {
 }
@@ -926,7 +924,6 @@ SSLNetVConnection::free(EThread *t)
   npnSet = NULL;
   npnEndpoint = NULL;
   sessionAcceptPtr = NULL;
-  eosRcvd = false;
   sslHandShakeComplete = false;
   free_handshake_buffers();
   sslTrace = false;
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8e26800..3f866f6 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -629,12 +629,6 @@ HttpSM::state_read_client_request_header(int event, void *data)
   if (!netvc && event != VC_EVENT_EOS)
     return 0;
 
-  // check to see if there was an EOS received on the SSL connection
-  SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(netvc);
-  if (ssl_vc && ssl_vc->isEosRcvd()) {
-    DebugSM("http", "EOS for ssl vc %p at read_first_btye state", netvc);
-    event = VC_EVENT_EOS;
-  }
   switch (event) {
   case VC_EVENT_READ_READY:
   case VC_EVENT_READ_COMPLETE:

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].