Merge remote-tracking branch 'origin/master' into topic/seth/smb

# Conflicts:
#	testing/btest/Baseline/plugins.hooks/output
#	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log
#	testing/btest/Baseline/scripts.policy.misc.dump-events/smtp-events.log
This commit is contained in:
Seth Hall 2016-06-29 09:43:31 -04:00
commit 514dfc3479
124 changed files with 92422 additions and 91965 deletions

View file

@ -0,0 +1,8 @@
# This tests that the HTTP analyzer handles filenames over HTTP correctly.
#
# @TEST-EXEC: bro -r $TRACES/http/http-filename.pcap %INPUT
# @TEST-EXEC: btest-diff http.log
# The base analysis scripts are loaded by default.
#@load base/protocols/http