From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Wed, 7 Apr 2021 00:05:55 +0000 (+0000)
Subject: Merge pull request #2830 in SNORT/snort3 from ~KATHARVE/snort3:nhi_remove_DI to master
X-Git-Tag: 3.1.4.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=089cc2df742ff0c625616f54fcc0260f4776611f;p=thirdparty%2Fsnort3.git

Merge pull request #2830 in SNORT/snort3 from ~KATHARVE/snort3:nhi_remove_DI to master

Squashed commit of the following:

commit 185ed88e6b45399659b7443a2daf809805d15bdb
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Apr 6 13:25:16 2021 -0400

    http_inspect: remove detained inspection config
---

diff --git a/src/service_inspectors/http_inspect/http_module.cc b/src/service_inspectors/http_inspect/http_module.cc
index d80db3a28..a1a19c5ae 100755
--- a/src/service_inspectors/http_inspect/http_module.cc
+++ b/src/service_inspectors/http_inspect/http_module.cc
@@ -79,10 +79,6 @@ const Parameter HttpModule::http_params[] =
     { "decompress_zip", Parameter::PT_BOOL, nullptr, "false",
       "decompress zip files in response bodies" },
 
-    // FIXIT-D remove
-    { "detained_inspection", Parameter::PT_BOOL, nullptr, "false",
-      "obsolete, do not configure" },
-
     { "script_detection", Parameter::PT_BOOL, nullptr, "false",
       "inspect JavaScript immediately upon script end" },
 
@@ -206,10 +202,6 @@ bool HttpModule::set(const char*, Value& val, SnortConfig*)
     {
         params->decompress_zip = val.get_bool();
     }
-    else if (val.is("detained_inspection"))
-    {
-        // obsolete parameter FIXIT-D
-    }
     else if (val.is("script_detection"))
     {
         params->script_detection = val.get_bool();