From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 10 May 2021 06:21:45 +0000 (+0000)
Subject: Merge pull request #2880 in SNORT/snort3 from ~MDAGON/snort3:h2i_detection to master
X-Git-Tag: 3.1.5.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e876af50fda459e0accab2f8473b922791c6fe7;p=thirdparty%2Fsnort3.git

Merge pull request #2880 in SNORT/snort3 from ~MDAGON/snort3:h2i_detection to master

Squashed commit of the following:

commit 2801cccf27ed16733f8ffa5c6054f845c39b56a6
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri May 7 14:20:06 2021 -0400

    http_inspect: don't disable detection for flow if it's an HTTP/2 flow
---

diff --git a/src/service_inspectors/http_inspect/http_msg_section.cc b/src/service_inspectors/http_inspect/http_msg_section.cc
index 1d9513966..1cfaf1a48 100644
--- a/src/service_inspectors/http_inspect/http_msg_section.cc
+++ b/src/service_inspectors/http_inspect/http_msg_section.cc
@@ -92,7 +92,8 @@ void HttpMsgSection::update_depth() const
     const int64_t& detect_depth_remaining = session_data->detect_depth_remaining[source_id];
 
     if ((detect_depth_remaining <= 0) &&
-        (session_data->detection_status[source_id] == DET_ON))
+        (session_data->detection_status[source_id] == DET_ON) &&
+        !session_data->for_http2)
     {
         session_data->detection_status[source_id] = DET_DEACTIVATING;
     }