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

Revert addition of final modifier to JSON formatter

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-06 10:40:09 -07:00
parent 39c00c9966
commit 8ac591c9f5
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.2.0-dev.473 | 2020-05-06 10:40:09 -0700
* Revert addition of final modifier to JSON formatter (Tim Wojtulewicz, Corelight)
3.2.0-dev.471 | 2020-05-06 10:00:58 -0700 3.2.0-dev.471 | 2020-05-06 10:00:58 -0700
* Fix global buffer over-read in POP3 analyzer (Justin Azoff, Corelight) * Fix global buffer over-read in POP3 analyzer (Justin Azoff, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.471 3.2.0-dev.473

2
src/threading/formatters/JSON.h
View file

@ -14,7 +14,7 @@ namespace threading { namespace formatter {
* A thread-safe class for converting values into a JSON representation * A thread-safe class for converting values into a JSON representation
* and vice versa. * and vice versa.
*/ */
class JSON final : public Formatter { class JSON : public Formatter {
public: public:
enum TimeFormat { enum TimeFormat {
TS_EPOCH, // Doubles that represents seconds from the UNIX epoch. TS_EPOCH, // Doubles that represents seconds from the UNIX epoch.