objectcache: make MediumSpecificBagOStuff::mergeViaCas() handle negative TTLs

Change-Id: Ieb503cdb5d0849be7b7be21780ae552ab937ae80

diff --git a/includes/libs/objectcache/MediumSpecificBagOStuff.php b/includes/libs/objectcache/MediumSpecificBagOStuff.php
index fe17628..5e9ebca 100644 (file)
--- a/includes/libs/objectcache/MediumSpecificBagOStuff.php
+++ b/includes/libs/objectcache/MediumSpecificBagOStuff.php
@@ -323,7 +323,7 @@ abstract class MediumSpecificBagOStuff extends BagOStuff {
                        unset( $currentValue ); // free RAM in case the value is large
 
                        $this->clearLastError();
-                       if ( $value === false ) {
+                       if ( $value === false || $exptime < 0 ) {
                                $success = true; // do nothing
                        } elseif ( $hadNoCurrentValue ) {
                                // Try to create the key, failing if it gets created in the meantime