X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Fobjectcache%2FHashBagOStuff.php;h=7a514ef6ef3d11c2dee11ae33475729a3f295d01;hb=fb5516524c335c7b6b6f84e33d7ee8b707589778;hp=bdcf18017fedc6794d44956a96b249351261657f;hpb=5def88354828f40548a6330077064876b5dbd1a8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php
index bdcf18017f..7a514ef6ef 100644
--- a/includes/libs/objectcache/HashBagOStuff.php
+++ b/includes/libs/objectcache/HashBagOStuff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Object caching using PHP arrays.
+ * Per-process memory cache for storing items.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +23,9 @@
 use Wikimedia\Assert\Assert;
 
 /**
- * This is a test of the interface, mainly. It stores things in an associative
- * array, which is not going to persist between program runs.
+ * Simple store for keeping values in an associative array for the current process.
+ *
+ * Data will not persist and is not shared with other processes.
  *
  * @ingroup Cache
  */
@@ -50,7 +51,7 @@ class HashBagOStuff extends BagOStuff {
 
 	protected function expire( $key ) {
 		$et = $this->bag[$key][self::KEY_EXP];
-		if ( $et == 0 || $et > time() ) {
+		if ( $et == self::TTL_INDEFINITE || $et > time() ) {
 			return false;
 		}
 
@@ -72,6 +73,8 @@ class HashBagOStuff extends BagOStuff {
 	}
 
 	public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+		// Refresh key position for maxCacheKeys eviction
+		unset( $this->bag[$key] );
 		$this->bag[$key] = array(
 			self::KEY_VAL => $value,
 			self::KEY_EXP => $this->convertExpiry( $exptime )