Merge remote-tracking branch 'origin/master' into topic/vladg/kerberos

Conflicts:
	NEWS
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
	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:
Vlad Grigorescu 2015-04-21 12:59:54 -04:00
commit 9f9bad48a4
90 changed files with 3010 additions and 3367 deletions

View file

@ -0,0 +1,10 @@
# This tests an issue with interaction between zero length
# http bodies and the file analysis code. It is creating
# files when there isn't actually any body there and shouldn't
# create a file.
#
# @TEST-EXEC: bro -r $TRACES/http/zero-length-bodies-with-drops.pcap %INPUT
# There shouldn't be a files log (no files!)
# @TEST-EXEC: test ! -f files.log