[mms] Fix key expiration for APC, Eaccelerator, and Xcache (Bug #12735).

horde · Oct 7, 2013 · 923c200 · 923c200
1 parent 31147d9
commit 923c200
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Apc.php b/framework/Cache/lib/Horde/Cache/Storage/Apc.php
@@ -95,7 +95,6 @@ public function clear()
      */
     protected function _setExpire($key, $lifetime)
     {
-        $key = $this->_params['prefix'] . $key;
         if ($lifetime == 0) {
             // Don't expire.
             return;

diff --git a/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php b/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php
@@ -100,7 +100,6 @@ protected function _setExpire($key, $lifetime)
             return;
         }
 
-        $key = $this->_params['prefix'] . $key;
         $expire = eaccelerator_get($key . '_expire');
 
         // Set prune period.

diff --git a/framework/Cache/lib/Horde/Cache/Storage/Xcache.php b/framework/Cache/lib/Horde/Cache/Storage/Xcache.php
@@ -86,7 +86,7 @@ public function clear()
     }
 
     /**
-     * Set expire time on each call since memcache sets it on cache creation.
+     * Set expire time on each call since xcache sets it on cache creation.
      *
      * @param string $key        Cache key to expire.
      * @param integer $lifetime  Lifetime of the data in seconds.
@@ -97,7 +97,6 @@ protected function _setExpire($key, $lifetime)
             // don't expire
             return;
         }
-        $key = $this->_params['prefix'] . $key;
         $expire = xcache_get($key . '_expire');
 
         // set prune period

diff --git a/framework/Cache/package.xml b/framework/Cache/package.xml
@@ -27,6 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix key expiration for APC, Eaccelerator, and Xcache (Bug #12735).
 * [mms] Add Horde_Cache_Storage_Memoryoverlay driver.
  </notes>
  <contents>
@@ -518,6 +519,7 @@ Initial packaging.
    <date>2013-09-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix key expiration for APC, Eaccelerator, and Xcache (Bug #12735).
 * [mms] Add Horde_Cache_Storage_Memoryoverlay driver.
    </notes>
   </release>