From 9708a8477e4e27d02b8e254177e9f0a663fb0672 Mon Sep 17 00:00:00 2001 From: Susan Hinrichs Date: Wed, 28 Sep 2016 01:26:41 +0000 Subject: [PATCH] TS-4899: Http2ClientSession object leaks. --- proxy/http2/Http2ClientSession.cc | 3 ++- proxy/http2/Http2ConnectionState.cc | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc index b8902135c34..adfec85c085 100644 --- a/proxy/http2/Http2ClientSession.cc +++ b/proxy/http2/Http2ClientSession.cc @@ -314,7 +314,8 @@ Http2ClientSession::main_event_handler(int event, void *edata) case VC_EVENT_ERROR: case VC_EVENT_EOS: this->do_io_close(); - return 0; + retval = 0; + break; case VC_EVENT_WRITE_READY: retval = 0; diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc index 7fe5efe7c60..212536eb488 100644 --- a/proxy/http2/Http2ConnectionState.cc +++ b/proxy/http2/Http2ConnectionState.cc @@ -807,9 +807,7 @@ Http2ConnectionState::main_event_handler(int event, void *edata) SCOPED_MUTEX_LOCK(lock, this->mutex, this_ethread()); send_data_frames_depends_on_priority(); _scheduled = false; - - return 0; - } + } break; // Parse received HTTP/2 frames case HTTP2_SESSION_EVENT_RECV: {