From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 23 Dec 2019 13:24:22 +0000 (+0000)
Subject: Merge pull request #1900 in SNORT/snort3 from ~THOPETER/snort3:h2i_remove_file_data... 
X-Git-Tag: 3.0.0-268~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760b7707eda93b811b2cd43a6d14acbf71a213a1;p=thirdparty%2Fsnort3.git

Merge pull request #1900 in SNORT/snort3 from ~THOPETER/snort3:h2i_remove_file_data to master

Squashed commit of the following:

commit 784c640f93cfb669d2f06112aece95a5d26fe044
Author: Tom Peters <thopeter@cisco.com>
Date:   Thu Dec 19 18:10:58 2019 -0500

    http2_inspect: frame data no longer in file_data
---

diff --git a/src/service_inspectors/http2_inspect/http2_frame.cc b/src/service_inspectors/http2_inspect/http2_frame.cc
index 5f69a93d6..ee0ea9c69 100644
--- a/src/service_inspectors/http2_inspect/http2_frame.cc
+++ b/src/service_inspectors/http2_inspect/http2_frame.cc
@@ -23,7 +23,6 @@
 
 #include "http2_frame.h"
 
-#include "detection/detection_engine.h"
 #include "http2_enum.h"
 #include "http2_flow_data.h"
 #include "http2_headers_frame.h"
@@ -43,7 +42,6 @@ Http2Frame::Http2Frame(const uint8_t* header_buffer, const int32_t header_len,
     if (data_len > 0)
     {
         data.set(data_len, data_buffer, true);
-        set_file_data(data.start(), data.length());
     }
 }