From: Premysl Hruby <dfenze@gmail.com>
Date: Wed, 28 Mar 2012 10:03:32 +0000 (+0200)
Subject: fix mstime() ommited while comparing if key is already expired
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/d48d1309c6712fef8894d4c5eced9bf9164b926a

fix mstime() ommited while comparing if key is already expired
---

diff --git a/src/db.c b/src/db.c
index 492e7aba..24cd1f5e 100644
--- a/src/db.c
+++ b/src/db.c
@@ -540,7 +540,7 @@ void expireGenericCommand(redisClient *c, long long offset, int unit) {
      *
      * Instead we take the other branch of the IF statement setting an expire
      * (possibly in the past) and wait for an explicit DEL from the master. */
-    if (milliseconds <= 0 && !server.loading && !server.masterhost) {
+    if (milliseconds <= mstime() && !server.loading && !server.masterhost) {
         robj *aux;
 
         redisAssertWithInfo(c,key,dbDelete(c->db,key));