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

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

View file

@ -172,7 +172,7 @@ event http_reply(c: connection, version: string, code: count, reason: string) &p
local s: State;
c$http_state = s;
}
# 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.
if ( c$http_state$current_response !in c$http_state$pending ||