From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 30 Mar 2020 11:54:35 +0000 (+0000)
Subject: Merge pull request #2114 in SNORT/snort3 from ~THOPETER/snort3:nhttp138 to master
X-Git-Tag: 3.0.1-1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8e7bc948bdb897db7eadd3049a0fce68711ae6;p=thirdparty%2Fsnort3.git

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 d32ed4383..77336a682 100644
--- 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);