Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 03:28:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/seth/mime-updates' into topic/seth/files-reassembly-and-mime-updates

Browse source 
Conflicts:
	scripts/base/init-bare.bro
	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log
	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log
This commit is contained in:
Seth Hall 2014-11-05 11:42:34 -05:00
commit e879aa78f5
10 changed files with 239 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log
View file

@ -71,6 +71,8 @@
1254722770.692786 file_mime_type
1254722770.692804 mime_end_entity
1254722770.692804 get_file_handle
1254722770.692804 file_new
1254722770.692804 file_over_new_connection
1254722770.692804 file_state_remove
1254722770.692804 get_file_handle
1254722770.692804 mime_end_entity
@ -85,6 +87,8 @@
1254722770.692804 file_over_new_connection
1254722770.692823 file_mime_type
1254722770.695115 new_connection
1254722771.469814 file_new
1254722771.469814 file_over_new_connection
1254722771.858334 mime_end_entity
1254722771.858334 get_file_handle
1254722771.858334 file_state_remove