[trafficserver] branch master updated: Fix another ProxySession and NetVC shutdown race crash

[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://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new b15b63e  Fix another ProxySession and NetVC shutdown race crash
b15b63e is described below

commit b15b63efd8c08c71e303780de6436eac2757cddf
Author: Susan Hinrichs <sh...@apache.org>
AuthorDate: Thu Aug 30 16:34:59 2018 +0000

    Fix another ProxySession and NetVC shutdown race crash
---
 proxy/ProxyClientSession.cc      | 4 ----
 proxy/http/Http1ClientSession.cc | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/proxy/ProxyClientSession.cc b/proxy/ProxyClientSession.cc
index c4fba5b..42f4f3b 100644
--- a/proxy/ProxyClientSession.cc
+++ b/proxy/ProxyClientSession.cc
@@ -198,10 +198,6 @@ ProxyClientSession::handle_api_return(int event)
     }
     break;
   case TS_HTTP_SSN_CLOSE_HOOK: {
-    NetVConnection *vc = this->get_netvc();
-    if (vc) {
-      vc->do_io_close();
-    }
     free(); // You can now clean things up
     break;
   }
diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index 31ed45d..4865886 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -135,6 +135,11 @@ Http1ClientSession::free()
   // Free the transaction resources
   this->trans.super_type::destroy();
 
+  if (client_vc) {
+    client_vc->do_io_close();
+    client_vc = nullptr;
+  }
+
   super::free();
   THREAD_FREE(this, http1ClientSessionAllocator, this_thread());
 }