Merge "add since tags"

[lhc/web/wiklou.git] / includes / objectcache / MemcachedClient.php

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index e816078..9602ffe 100644 (file)
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -832,7 +832,7 @@ class MWMemcached {
         * @access private
         */
        function _hashfunc( $key ) {
-               # Hash function must on [0,0x7ffffff]
+               # Hash function must be in [0,0x7ffffff]
                # We take the first 31 bits of the MD5 hash, which unlike the hash
                # function used in a previous version of this client, works
                return hexdec( substr( md5( $key ), 0, 8 ) ) & 0x7fffffff;
@@ -979,15 +979,6 @@ class MWMemcached {
                        $this->stats[$cmd] = 1;
                }
 
-               // TTLs higher than 30 days will be detected as absolute TTLs
-               // (UNIX timestamps), and will result in the cache entry being
-               // discarded immediately because the expiry is in the past.
-               // Clamp expiries >30d at 30d, unless they're >=1e9 in which
-               // case they are likely to really be absolute (1e9 = 2011-09-09)
-               if ( $exp > 2592000 && $exp < 1000000000 ) {
-                       $exp = 2592000;
-               }
-
                $flags = 0;
 
                if ( !is_scalar( $val ) ) {