diff --git a/CHANGES b/CHANGES index 3f11c55338..287f74286d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.1-1035 | 2013-08-05 16:44:50 -0400 + + * Change to SSL log delay to cause the log to write even if delay times out. (Seth Hall) + 2.1-1034 | 2013-08-03 20:27:43 -0700 * A set of DHCP extensions. (Vlad Grigorescu) diff --git a/VERSION b/VERSION index 5ed761d1ae..491bca5672 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1-1034 +2.1-1035 diff --git a/scripts/base/protocols/ssl/main.bro b/scripts/base/protocols/ssl/main.bro index 0d4a8435f0..67293c5bca 100644 --- a/scripts/base/protocols/ssl/main.bro +++ b/scripts/base/protocols/ssl/main.bro @@ -137,8 +137,8 @@ function log_record(info: Info) } timeout 15secs { - Reporter::info(fmt("SSL delay tokens not released in time (%s tokens remaining)", - |info$delay_tokens|)); + # We are just going to log the record anyway. + log_record(info); } } }