Changeset 2393

Timestamp:

04/01/2008 03:55:18 AM (8 months ago)

Author:

Geert

Message:

Fix #539

Location:

trunk/system/libraries/drivers/Cache

Files:

• Apc.php (modified) (2 diffs)
• Eaccelerator.php (modified) (2 diffs)
• File.php (modified) (2 diffs)
• Memcache.php (modified) (1 diff)
• Xcache.php (modified) (1 diff)

trunk/system/libraries/drivers/Cache/Apc.php

@@ -27 +27 @@
                 count($tags) and Log::add('error', 'Cache: tags are unsupported by the APC driver');
 
+                // APC expects time to live, not a unix timestamp
+                if ($expiration !== 0)
+                {
+                        $expiration -= time();
+                }
+
                 return apc_store($id, $data, $expiration);
         }
@@ -38 +44 @@
         {
                 if ($id === TRUE)
-                {
                         return apc_clear_cache('user');
-                }
-                elseif ($tag == FALSE)
-                {
+
+                if ($tag == FALSE)
                         return apc_delete($id);
-                }
-                else
-                {
-                        return true;
-                }
+
+                return TRUE;
         }
 

trunk/system/libraries/drivers/Cache/Eaccelerator.php

@@ -32 +32 @@
                 count($tags) and Log::add('error', 'tags are unsupported by the eAccelerator driver');
 
+                // eAccelerator expects time to live, not a unix timestamp
+                if ($expiration !== 0)
+                {
+                        $expiration -= time();
+                }
+
                 return eaccelerator_put($id, $data, $expiration);
         }
@@ -38 +44 @@
         {
                 if ($id === TRUE)
-                {
                         return eaccelerator_clean();
-                }
-                elseif ($tag == FALSE)
-                {
+
+                if ($tag == FALSE)
                         return eaccelerator_rm($id);
-                }
-                else
-                {
-                        return TRUE;
-                }
+
+                return TRUE;
         }
 

trunk/system/libraries/drivers/Cache/File.php

@@ -204 +204 @@
         /**
          * Deletes all cache files that are older than the current time.
+         *
+         * @return void
          */
         public function delete_expired()
@@ -222 +224 @@
         /**
          * Check if a cache file has expired by filename.
+         *
+         * @param  string  filename
+         * @return bool
          */
         protected function expired($file)

trunk/system/libraries/drivers/Cache/Memcache.php

@@ -55 +55 @@
         {
                 if ($id === TRUE)
-                {
                         return $this->backend->flush();
-                }
-                elseif ($tag == FALSE)
-                {
+
+                if ($tag == FALSE)
                         return $this->backend->delete($id);
-                }
-                else
-                {
-                        return TRUE;
-                }
+
+                return TRUE;
         }
 

trunk/system/libraries/drivers/Cache/Xcache.php

@@ -29 +29 @@
         {
                 count($tags) and Log::add('error', 'Cache: tags are unsupported by the Xcache driver');
+
+                // XCache expects time to live, not a unix timestamp
+                if ($expiration !== 0)
+                {
+                        $expiration -= time();
+                }
 
                 return xcache_set($id, $data, $expiration);