Merge pull request #2391 in SNORT/snort3 from ~MDAGON/snort3:h2i_flushfix to master

Squashed commit of the following:

commit 4bbaa007fda17fc80179f3713d71e505a1a7cd4e
Author: mdagon <mdagon@cisco.com>
Date:   Mon Aug 10 08:52:06 2020 -0400

    http2_inpsect: fix for flush on data frame boundray w/o end of stream

diff --git a/src/service_inspectors/http2_inspect/http2_data_cutter.cc b/src/service_inspectors/http2_inspect/http2_data_cutter.cc
index 5f5519bb5e3fddcdfe957f9a986d9e9545ac79bc..e764f9e016dc05395af34b2c84b5b4b805a03a5f 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_data_cutter.cc
+++ b/src/service_inspectors/http2_inspect/http2_data_cutter.cc
@@ -170,7 +170,7 @@ StreamSplitter::Status Http2DataCutter::http_scan(const uint8_t* data, uint32_t*
                 finish_msg_body();
                 return StreamSplitter::FLUSH;
             }
-            else
+            else if (scan_result != StreamSplitter::FLUSH)
                 session_data->data_processing[source_id] = true;
         }
     }