diff --git a/CHANGES b/CHANGES index 7bcf6a3ef4..6202e2c47a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,16 @@ +2.4-236 | 2016-01-15 10:35:21 -0800 + + * Add HTTP version information to HTTP log file. (Aaron Eppert) + + * Add NOTIFY as a valid SIP message, per RFC 3265. (Aaron Eppert) + + * Let HTTP parser reject requests that don't have both URI and + version. (William Glodek) + + * Fix crash when deleting non existing record member. Addresses + BIT-1519. (Johanna Amann) + 2.4-228 | 2015-12-19 13:40:09 -0800 * Updating BroControl submodule. diff --git a/VERSION b/VERSION index dde094552f..ac096732cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-228 +2.4-236 diff --git a/scripts/base/protocols/http/main.bro b/scripts/base/protocols/http/main.bro index e74ffaa8d4..e70d166f11 100644 --- a/scripts/base/protocols/http/main.bro +++ b/scripts/base/protocols/http/main.bro @@ -41,6 +41,8 @@ export { ## misspelled like the standard declares, but the name used here ## is "referrer" spelled correctly. referrer: string &log &optional; + ## Value of the version portion of the request. + version: string &log &optional; ## Value of the User-Agent header from the client. user_agent: string &log &optional; ## Actual uncompressed content size of the data transferred from @@ -222,6 +224,8 @@ event http_reply(c: connection, version: string, code: count, reason: string) &p c$http$status_code = code; c$http$status_msg = reason; + c$http$version = version; + if ( code_in_range(code, 100, 199) ) { c$http$info_code = code;