This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push: new f2b828d Make Http2ClientSession inactive on EOS event f2b828d is described below commit f2b828d39b94c33b963845f7fcf23d8982664e4c Author: Masaori Koshiba <masa...@apache.org> AuthorDate: Tue Jun 9 16:04:16 2020 +0900 Make Http2ClientSession inactive on EOS event (cherry picked from commit e9c3a136bfd5b06178c22b095263eb34673eb657) --- proxy/http2/Http2ClientSession.cc | 3 +++ proxy/http2/Http2ConnectionState.cc | 2 ++ 2 files changed, 5 insertions(+) diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc index 2ecfa2e..da44c70 100644 --- a/proxy/http2/Http2ClientSession.cc +++ b/proxy/http2/Http2ClientSession.cc @@ -103,6 +103,9 @@ Http2ClientSession::free() REMEMBER(NO_EVENT, this->recursion) Http2SsnDebug("session free"); + // Don't free active ProxySession + ink_release_assert(is_active() == false); + this->_milestones.mark(Http2SsnMilestone::CLOSE); ink_hrtime total_time = this->_milestones.elapsed(Http2SsnMilestone::OPEN, Http2SsnMilestone::CLOSE); diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc index 3c1654e..ecb8cf4 100644 --- a/proxy/http2/Http2ConnectionState.cc +++ b/proxy/http2/Http2ConnectionState.cc @@ -1403,6 +1403,8 @@ Http2ConnectionState::release_stream() if (total_client_streams_count == 0) { if (fini_received) { + ua_session->clear_session_active(); + // We were shutting down, go ahead and terminate the session // this is a member of Http2ConnectionState and will be freed // when ua_session is destroyed