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

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-serializer

Browse source 
# Conflicts:
#	src/File.cc
#	src/File.h
#	src/StateAccess.h
#	src/bro.bif
This commit is contained in:
Johanna Amann 2019-05-22 15:16:31 -07:00
commit 7ae5c7d1b4
68 changed files with 394 additions and 747 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/analyzer/protocol/tcp/TCP_Reassembler.cc
View file

@ -106,9 +106,6 @@ void TCP_Reassembler::SetContentsFile(BroFile* f)
RecordToSeq(blocks->seq, last_reassem_seq, f);
}
// Don't want rotation on these files.
f->SetRotateInterval(0);
Ref(f);
record_contents_file = f;
}