diff --git a/CHANGES b/CHANGES index d702d85b3f..caf5e86460 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,19 @@ +2.4-620 | 2016-06-15 09:05:37 -0700 + + * Fixing memory leak in changed table expiration code. (Robin + Sommer) + + * Fixing test portability. (Robin Sommer) + + * Move the HTTP "filename" field (which was never filled out + anyways) to "orig_filenames" and "resp_filenames". (Seth Hall) + + * Add a round trip time (rtt) field to dns.log. (Seth Hall) + + * Add ACE archive files to the identified file types. Addresses + BIT-1609. (Stephen Hosom) + 2.4-613 | 2016-06-14 18:10:37 -0700 * Preventing the event processing from looping endlessly when an diff --git a/VERSION b/VERSION index ac2ea9d11f..64d51a79c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-613 +2.4-620 diff --git a/src/Val.cc b/src/Val.cc index 7341aada03..ca8551f7a7 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -2274,8 +2274,10 @@ double TableVal::GetExpireTime() return -1; Val* timeout = expire_time->Eval(0); + double interval = (timeout ? timeout->AsInterval() : -1); + Unref(timeout); - if ( timeout && (timeout->AsInterval() >= 0) ) + if ( interval >= 0 ) return timeout->AsInterval(); expire_time = 0;