Update htp event handler to both warning and error events regardless of any conditions.

pull/567/head
Anoop Saldanha 12 years ago
parent b1dffdfbe0
commit 9e4eec200f

@ -656,7 +656,6 @@ static int HTPHandleRequestData(Flow *f, void *htp_state,
switch(r) { switch(r) {
case HTP_STREAM_ERROR: case HTP_STREAM_ERROR:
HTPHandleError(hstate);
hstate->flags |= HTP_FLAG_STATE_ERROR; hstate->flags |= HTP_FLAG_STATE_ERROR;
hstate->flags &= ~HTP_FLAG_STATE_DATA; hstate->flags &= ~HTP_FLAG_STATE_DATA;
@ -665,17 +664,17 @@ static int HTPHandleRequestData(Flow *f, void *htp_state,
break; break;
case HTP_STREAM_DATA: case HTP_STREAM_DATA:
case HTP_STREAM_DATA_OTHER: case HTP_STREAM_DATA_OTHER:
HTPHandleWarning(hstate);
hstate->flags |= HTP_FLAG_STATE_DATA; hstate->flags |= HTP_FLAG_STATE_DATA;
break; break;
case HTP_STREAM_TUNNEL: case HTP_STREAM_TUNNEL:
break; break;
default: default:
HTPHandleWarning(hstate);
hstate->flags &= ~HTP_FLAG_STATE_DATA; hstate->flags &= ~HTP_FLAG_STATE_DATA;
hstate->flags &= ~HTP_FLAG_NEW_BODY_SET; hstate->flags &= ~HTP_FLAG_NEW_BODY_SET;
} }
HTPHandleWarning(hstate);
HTPHandleError(hstate);
/* if the TCP connection is closed, then close the HTTP connection */ /* if the TCP connection is closed, then close the HTTP connection */
if ((pstate->flags & APP_LAYER_PARSER_EOF) && if ((pstate->flags & APP_LAYER_PARSER_EOF) &&

Loading…
Cancel
Save