Merge pull request #2114 in SNORT/snort3 from ~THOPETER/snort3:nhttp138 to master

Squashed commit of the following:

commit cdbf6e7e9e313444606b38d2afcea79954cca108
Author: Tom Peters <thopeter@cisco.com>
Date:   Fri Mar 27 11:47:19 2020 -0400

    http_inspect: added FIXIT for thread safety

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index d32ed4383d2b3c7dfb134b7084413cce970c9843..77336a682fd142b6c0ec66a9a2098d2474744082 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -83,6 +83,7 @@ bool HttpInspect::configure(SnortConfig* )
     if (params->js_norm_param.normalize_javascript)
         params->js_norm_param.js_norm->configure();
 
+    // FIXIT-H The following four lines are not thread safe during reload
     xtra_trueip_id = Stream::reg_xtra_data_cb(get_xtra_trueip);
     xtra_uri_id = Stream::reg_xtra_data_cb(get_xtra_uri);
     xtra_host_id = Stream::reg_xtra_data_cb(get_xtra_host);