From: Bhagya Tholpady (bbantwal) <bbantwal@cisco.com>
Date: Tue, 14 Apr 2020 12:11:32 +0000 (+0000)
Subject: Merge pull request #2154 in SNORT/snort3 from ~OSHUMEIK/snort3:ffix to master
X-Git-Tag: 3.0.1-2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5940a58ab3a42a7227db984582e3c3a50bd2f97;p=thirdparty%2Fsnort3.git

Merge pull request #2154 in SNORT/snort3 from ~OSHUMEIK/snort3:ffix to master

Squashed commit of the following:

commit 883564c8dbd5be8ad0b1da80074915177f317b39
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Mon Apr 13 11:12:01 2020 +0300

    http_inspect: fix duplicated detained_inspection print in show()
---

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 920833cf2..458f8669e 100644
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -136,7 +136,6 @@ void HttpInspect::show(snort::SnortConfig*)
     ConfigLogger::log_flag("normalize_javascript", params->js_norm_param.normalize_javascript);
     ConfigLogger::log_value("max_javascript_whitespaces",
         params->js_norm_param.max_javascript_whitespaces);
-    ConfigLogger::log_flag("detained_inspection", params->detained_inspection);
     ConfigLogger::log_value("bad_characters", bad_chars.c_str());
     ConfigLogger::log_value("ignore_unreserved", unreserved_chars.c_str());
     ConfigLogger::log_flag("percent_u", params->uri_param.percent_u);