[memcached] bradfitz, r386: n/a

[commits at code.sixapart.com]

n/a


U   branches/memcached-1.1.x/memcached.c
D   branches/memcached-1.1.x/t/unixsocket.t


Modified: branches/memcached-1.1.x/memcached.c
===================================================================
--- branches/memcached-1.1.x/memcached.c	2006-09-09 19:49:36 UTC (rev 385)
+++ branches/memcached-1.1.x/memcached.c	2006-09-09 20:00:46 UTC (rev 386)
@@ -58,11 +58,12 @@
 
 int *buckets = 0; /* bucket->generation array for a managed instance */
 
+/* no. of seconds in 30 days - largest possible delta exptime */
+#define REALTIME_MAXDELTA 60*60*24*30
+
 time_t realtime(time_t exptime) {
     time_t now;
 
-    /* no. of seconds in 30 days - largest possible delta exptime */
-    #define REALTIME_MAXDELTA 60*60*24*30
 
     if (exptime == 0) return 0; /* 0 means never expire */
 
@@ -595,7 +596,7 @@
         if (it && (it->it_flags & ITEM_DELETED)) {
             it = 0;
         }
-        if (it && it->exptime && it->exptime < now) {
+        if (it && it->exptime && it->exptime <= now) {
             item_unlink(it);
             it = 0;
         }
@@ -676,7 +677,7 @@
                 item_unlink(it);
                 it = 0;
             }
-            if (it && it->exptime && it->exptime < now) {
+            if (it && it->exptime && it->exptime <= now) {
                 item_unlink(it);
                 it = 0;
             }
@@ -1384,7 +1385,7 @@
         time_t now = time(0);
         for (i=0; i<delcurr; i++) {
             item *it = todelete[i];
-            if (it->exptime < now) {
+            if (it->exptime <= now) {
                 assert(it->refcount > 0);
                 it->it_flags &= ~ITEM_DELETED;
                 item_unlink(it);

Deleted: branches/memcached-1.1.x/t/unixsocket.t
===================================================================
--- branches/memcached-1.1.x/t/unixsocket.t	2006-09-09 19:49:36 UTC (rev 385)
+++ branches/memcached-1.1.x/t/unixsocket.t	2006-09-09 20:00:46 UTC (rev 386)
@@ -1,11 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Test::More skip_all => "Tests not written.";  # tests => 1
-use FindBin qw($Bin);
-use lib "$Bin/lib";
-use MemcachedTest;
-
-my $server = new_memcached();
-my $sock = $server->sock;
-