Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of ssh://git.bro-ids.org/bro

Browse source 
Conflicts:
	scripts/base/protocols/http/main.bro
This commit is contained in:
Robin Sommer 2011-09-29 18:54:50 -07:00
commit 221d1663be
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/protocols/http/main.bro
View file

@ -172,7 +172,7 @@ event http_reply(c: connection, version: string, code: count, reason: string) &p
local s: State; local s: State;
c$http_state = s; c$http_state = s;
} }
# If the last response was an informational 1xx, we're still expecting # If the last response was an informational 1xx, we're still expecting
# the real response to the request, so don't create a new Info record yet. # the real response to the request, so don't create a new Info record yet.
if ( c$http_state$current_response !in c$http_state$pending || if ( c$http_state$current_response !in c$http_state$pending ||

2
testing/btest/scripts/base/protocols/http/100-continue.bro
View file

@ -4,7 +4,7 @@
# in a way that correlates the final response with the request. # in a way that correlates the final response with the request.
# #
# @TEST-EXEC: bro -r $TRACES/http-100-continue.trace %INPUT # @TEST-EXEC: bro -r $TRACES/http-100-continue.trace %INPUT
# @TEST-EXEC: grep -q unmatched_HTTP_reply weird.log && exit 1 || exit 0 # @TEST-EXEC: grep -q unmatched_HTTP_reply weird.log && exit 0 || exit 1
# @TEST-EXEC: btest-diff http.log # @TEST-EXEC: btest-diff http.log
# The base analysis scripts are loaded by default. # The base analysis scripts are loaded by default.

2
testing/btest/scripts/base/protocols/http/http-header-crlf.bro
View file

@ -3,7 +3,7 @@
# not report that weird. # not report that weird.
# #
# @TEST-EXEC: bro -r $TRACES/http-byteranges.trace %INPUT # @TEST-EXEC: bro -r $TRACES/http-byteranges.trace %INPUT
# @TEST-EXEC: grep -q http_no_crlf_in_header_list weird.log && exit 1 || exit 0 # @TEST-EXEC: grep -q http_no_crlf_in_header_list weird.log && exit 0 || exit 1
# The base analysis scripts are loaded by default. # The base analysis scripts are loaded by default.
#@load base/protocols/http #@load base/protocols/http