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

Conflicts:
	scripts/base/protocols/http/main.bro

scripts/base/protocols/http/main.bro

@@ -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 ||

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

@@ -4,7 +4,7 @@
 # in a way that correlates the final response with the request.
 #
 # @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
 
 # The base analysis scripts are loaded by default.

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

@@ -3,7 +3,7 @@
 # not report that weird.
 #
 # @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.
 #@load base/protocols/http