This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 15523bcdd6d68f63dffc0dc7df6b27e7fa4c1833 Author: Masaori Koshiba <[email protected]> AuthorDate: Fri Jan 31 16:25:39 2020 +0900 Remove unnecesary HttpSM handler call with VC_EVENT_ERROR (cherry picked from commit 240bb69f83d0111d96352af3104a4bdff88fd2e8) Conflicts: proxy/http2/Http2Stream.cc --- proxy/http2/Http2Stream.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc index ed160c9..e3fa693 100644 --- a/proxy/http2/Http2Stream.cc +++ b/proxy/http2/Http2Stream.cc @@ -463,7 +463,6 @@ Http2Stream::initiating_close() // This should result in do_io_close or release being called. That will schedule the final // kill yourself signal - // Send the SM the EOS signal if there are no active VIO's to signal // We are sending signals rather than calling the handlers directly to avoid the case where // the HttpTunnel handler causes the HttpSM to be deleted on the stack. bool sent_write_complete = false; @@ -490,9 +489,6 @@ Http2Stream::initiating_close() Http2StreamDebug("send EOS to read cont"); read_event = send_tracked_event(read_event, VC_EVENT_EOS, &read_vio); } - } else if (current_reader) { - SCOPED_MUTEX_LOCK(lock, current_reader->mutex, this_ethread()); - current_reader->handleEvent(VC_EVENT_ERROR); } else if (!sent_write_complete) { // Transaction is already gone or not started. Kill yourself do_io_close();
