Merge pull request #48 in SNORT/snort3 from hi to master

Squashed commit of the following:

commit 79a20c2c168e7020bca828e5a7c3e86dbeb068b2
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Sep 28 12:55:47 2015 -0400

    Correction to file_decomp error logic.

diff --git a/src/service_inspectors/http_inspect/hi_main.cc b/src/service_inspectors/http_inspect/hi_main.cc
index fabb52bfb9526597f2b24371d497331e2501be1e..a79e848a201cff3bd08f5919b355f6d076f936c8 100644 (file)
--- a/src/service_inspectors/http_inspect/hi_main.cc
+++ b/src/service_inspectors/http_inspect/hi_main.cc
@@ -1050,7 +1050,7 @@ int HttpInspectMain(HTTPINSPECT_CONF* conf, Packet* p)
                         session->server.response.body = Data;
                         session->server.response.body_size = Data_Len;
 
-                        hi_set_event(GID_HTTP_SERVER, hsd->fd_state->Error_Event);
+                        File_Decomp_Alert(hsd->fd_state, hsd->fd_state->Error_Event);
                         File_Decomp_StopFree(hsd->fd_state);
                         hsd->fd_state = NULL;
                     }