Merge pull request #2755 in SNORT/snort3 from ~THOPETER/snort3:di_reversion to master

Squashed commit of the following:

commit 182ae204f53679e1a86031649361399cf757637f
Author: Tom Peters <thopeter@cisco.com>
Date:   Thu Feb 18 13:44:19 2021 -0500

    http_inspect: temporarily restore detained_inspection parameter

diff --git a/src/service_inspectors/http_inspect/http_module.cc b/src/service_inspectors/http_inspect/http_module.cc
index 7a1d97d829264ab395047e548a3e8dc72b784dad..d60171a434013c1b9c0a2de253b3de63a57ef458 100755 (executable)
--- a/src/service_inspectors/http_inspect/http_module.cc
+++ b/src/service_inspectors/http_inspect/http_module.cc
@@ -79,6 +79,10 @@ 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" },
 
@@ -198,6 +202,10 @@ 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();