Merge remote-tracking branch 'origin/master' into topic/seth/more-file-type-ident-fixes

This commit is contained in:
Seth Hall 2015-04-09 23:58:52 -04:00
commit 49926ad7bf
284 changed files with 8116 additions and 2701 deletions

View file

@ -142,7 +142,7 @@ redef likely_server_ports += { ports };
# Initialize the HTTP logging stream and ports.
event bro_init() &priority=5
{
Log::create_stream(HTTP::LOG, [$columns=Info, $ev=log_http]);
Log::create_stream(HTTP::LOG, [$columns=Info, $ev=log_http, $path="http"]);
Analyzer::register_for_ports(Analyzer::ANALYZER_HTTP, ports);
}