stream: raw reassembly explicit disable raw handling

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 0366789f5bf24674a66892e786f69cc98ce3117f..dbe17dedabb6f19310f6b01fea222f067cf32863 100644 (file)
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -1218,7 +1218,8 @@ bool StreamReassembleRawHasDataReady(TcpSession *ssn, Packet *p)
         return false;
     }
 
-    if (stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY)
+    if (stream->flags & (STREAMTCP_STREAM_FLAG_NOREASSEMBLY|
+                         STREAMTCP_STREAM_FLAG_DISABLE_RAW))
         return false;
 
     if (StreamTcpInlineMode() == FALSE) {
@@ -1543,7 +1544,7 @@ int StreamReassembleRaw(TcpSession *ssn, const Packet *p,
         stream = &ssn->server;
     }
 
-    if ((stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) ||
+    if ((stream->flags & (STREAMTCP_STREAM_FLAG_NOREASSEMBLY|STREAMTCP_STREAM_FLAG_DISABLE_RAW)) ||
         StreamTcpReassembleRawCheckLimit(ssn, stream, p) == 0)
     {
         *progress_out = STREAM_RAW_PROGRESS(stream);