You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2016/10/04 15:28:57 UTC

[trafficserver] 01/02: TS-4899: Http2ClientSession object leaks.

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

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

commit e7f9983e200ab9c733c087cef0983b6601518b44
Author: Susan Hinrichs <sh...@ieee.org>
AuthorDate: Wed Sep 28 01:26:41 2016 +0000

    TS-4899: Http2ClientSession object leaks.
    
    (cherry picked from commit 1b09d40b8f117923942ad951cd7c859811ec41a3)
---
 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 b890213..adfec85 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 7fe5efe..212536e 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: {

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