Merge pull request #2587 in SNORT/snort3 from ~THOPETER/snort3:h2i14 to master

Squashed commit of the following:

commit 813cf2836d88aaff8f3dd6735dc1a8c04000cadb
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Oct 28 18:07:52 2020 -0400

    http2_inspect: multi-segment reassemble discard bug fix

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
index 83c9c81efa1984048e5b6b9d176abf4ef06ffa8d..03ad730ea72fb85de2604041c85fc12a199b3279 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
@@ -159,7 +159,8 @@ const StreamBuffer Http2StreamSplitter::reassemble(Flow* flow, unsigned total, u
     if (session_data->payload_discard[source_id])
     {
         StreamBuffer frame_buf { nullptr, 0 };
-        session_data->payload_discard[source_id] = false;
+        if (flags & PKT_PDU_TAIL)
+            session_data->payload_discard[source_id] = false;
 
 #ifdef REG_TEST
         if (HttpTestManager::use_test_output(HttpTestManager::IN_HTTP2))