You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2016/05/20 16:49:43 UTC

[trafficserver] 11/15: Remove double call to NetVConnection->do_io_read.

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

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit 3a8a3c2c5340b8b403c07a258e202f6fc03769c0
Author: David Calavera <da...@gmail.com>
AuthorDate: Fri May 13 14:12:22 2016 -0700

    Remove double call to NetVConnection->do_io_read.
    
    Signed-off-by: David Calavera <da...@gmail.com>
    (cherry picked from commit 58d4a14046d992487c5873a679125f8257f0ed79)
---
 proxy/http/HttpSM.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index e9eb3cb..97c4568 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -630,9 +630,9 @@ HttpSM::state_read_client_request_header(int event, void *data)
     return 0;
 
   // check to see if there was an EOS received on the SSL connection
-  SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(ua_session->get_netvc());
+  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", ua_session->get_netvc());
+    DebugSM("http", "EOS for ssl vc %p at read_first_btye state", netvc);
     event = VC_EVENT_EOS;
   }
   switch (event) {
@@ -705,8 +705,8 @@ HttpSM::state_read_client_request_header(int event, void *data)
 
       // Turn off read eventing until we get the
       // blind tunnel infrastructure set up
-      ua_session->get_netvc()->do_io_read(this, 0, NULL);
-      netvc->do_io_read(this, 0, NULL);
+      if (netvc)
+        netvc->do_io_read(this, 0, NULL);
 
       /* establish blind tunnel */
       setup_blind_tunnel_port();

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