mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 00:28:21 +00:00

Thanks to git this merge was less troublesome that I was afraid it would be. Not all tests pass yet though (and file hashes have changed unfortunately). Conflicts: cmake doc/scripts/DocSourcesList.cmake scripts/base/init-bare.bro scripts/base/protocols/ftp/main.bro scripts/base/protocols/irc/dcc-send.bro scripts/test-all-policy.bro src/AnalyzerTags.h src/CMakeLists.txt src/analyzer/Analyzer.cc src/analyzer/protocol/file/File.cc src/analyzer/protocol/file/File.h src/analyzer/protocol/http/HTTP.cc src/analyzer/protocol/http/HTTP.h src/analyzer/protocol/mime/MIME.cc src/event.bif src/main.cc src/util-config.h.in 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/istate.events-ssl/receiver.http.log testing/btest/Baseline/istate.events-ssl/sender.http.log testing/btest/Baseline/istate.events/receiver.http.log testing/btest/Baseline/istate.events/sender.http.log
28 lines
759 B
Text
28 lines
759 B
Text
FILE_NEW
|
|
1V1QkS1JR02, 0, 0
|
|
FILE_BOF_BUFFER
|
|
hello world
|
|
MIME_TYPE
|
|
text/plain
|
|
FILE_STATE_REMOVE
|
|
1V1QkS1JR02, 11, 0
|
|
[orig_h=141.142.228.5, orig_p=53595/tcp, resp_h=54.243.55.129, resp_p=80/tcp]
|
|
total bytes: 11
|
|
source: HTTP
|
|
MD5: 5eb63bbbe01eeed093cb22bb8f5acdc3
|
|
SHA1: 2aae6c35c94fcfb415dbe95f408b9ce91ee846ed
|
|
SHA256: b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9
|
|
FILE_NEW
|
|
IYuq13QwRPh, 0, 0
|
|
FILE_BOF_BUFFER
|
|
{^J "origin
|
|
MIME_TYPE
|
|
text/plain
|
|
FILE_STATE_REMOVE
|
|
IYuq13QwRPh, 366, 0
|
|
[orig_h=141.142.228.5, orig_p=53595/tcp, resp_h=54.243.55.129, resp_p=80/tcp]
|
|
total bytes: 366
|
|
source: HTTP
|
|
MD5: c9337794df612aeaa901dcf9fa446bca
|
|
SHA1: 6a1582672c203210c6d18d700322060b676365e7
|
|
SHA256: 8eb24c16df7cb45cb6a1790b0d26ad2571f754228d0ac111b3ac59adbfecbeb8
|