Index: memcached.php
===================================================================
--- memcached.php	(revision 1324)
+++ memcached.php	(working copy)
@@ -13,11 +13,11 @@
 class memcachedCache extends Cache {
   var $settings = array();
   var $memcached;
-  
+
   function page_fast_cache() {
     return $this->fast_cache;
   }
-  
+
   function __construct($bin, $options, $default_options) {
     // Assign the servers on the following order: bin specific -> default specific -> localhost port 11211
     if (isset($options['servers'])) {
@@ -37,33 +37,33 @@
         $this->settings['shared'] = TRUE;
       }
     }
-                                
+
     parent::__construct($bin, $options, $default_options);
-    
+
     $this->connect();
   }
-  
+
   function get($key) {
     // Attempt to pull from static cache.
     $cache = parent::get($this->key($key));
     if (isset($cache)) {
       return $cache;
     }
-    
+
     // Get from memcached
     $cache = $this->memcached->get($this->key($key));
-    
-    // Update static cache 
+
+    // Update static cache
     parent::set($this->key($key), $cache);
-    
+
     return $cache;
   }
-  
+
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
     if ($expire == CACHE_TEMPORARY) {
       $expire = 180;
     }
-    
+
     // Create new cache object.
     $cache = new stdClass;
     $cache->cid = $key;
@@ -71,7 +71,7 @@
     $cache->expire = $expire;
     $cache->headers = $headers;
     $cache->data = $value;
-    
+
     if (!empty($key)) {
       if ($this->settings['shared']) {
         if ($this->lock()) {
@@ -87,7 +87,7 @@
           $lookup[$this->key($key)] = 1;
 
           // Attempt to store full key and value
-          if (!$this->memcached->set($this->key($key), $cache, $this->settings['compress'], $expire)) {
+          if (!$this->memcached->set($this->key($key), $cache, $expire)) {
             unset($lookup[$this->key($key)]);
             $return = FALSE;
           }
@@ -98,7 +98,7 @@
           }
 
           // Resave the lookup table (even on failure)
-          $this->memcached->set($this->lookup, $lookup, $this->settings['compress'], $expire);  
+          $this->memcached->set($this->lookup, $lookup, $expire);
 
           // Remove lock.
           $this->unlock();
@@ -106,15 +106,15 @@
       }
       else {
         // Update memcached
-        return $this->memcached->set($this->key($key), $cache, $this->settings['compress'], $expire);
+        return $this->memcached->set($this->key($key), $cache, $expire);
       }
     }
   }
-  
+
   function delete($key) {
     // Delete from static cache
     parent::flush();
-    
+
     if (substr($key, strlen($key) - 1, 1) == '*') {
       $key = $this->key(substr($key, 0, strlen($key) - 1));
       if ($this->settings['shared']) {
@@ -128,7 +128,7 @@
           }
         }
         if ($this->lock()) {
-          $this->memcached->set($this->lookup, $lookup, $this->settings['compress'], 0); 
+          $this->memcached->set($this->lookup, $lookup, 0);
           $this->unlock();
         }
       }
@@ -142,11 +142,11 @@
       }
     }
   }
-  
+
   function flush() {
     // Flush static cache
     parent::flush();
-    
+
     // If this is a shared cache, we need to cycle through the lookup table and remove individual
     // items directly
     if ($this->settings['shared']) {
@@ -168,7 +168,7 @@
         }
 
         // Resave the lookup table (even on failure)
-        $this->memcached->set($this->lookup, $lookup, $this->settings['compress'], 0);
+        $this->memcached->set($this->lookup, $lookup, 0);
 
         // Remove lock
         $this->unlock();
@@ -179,7 +179,7 @@
       return $this->memcached->flush();
     }
   }
-  
+
   function lock() {
     // Lock once by trying to add lock file, if we can't get the lock, we will loop
     // for 3 seconds attempting to get lock.  If we still can't get it at that point,
@@ -194,11 +194,11 @@
     }
     return TRUE;
   }
-  
+
   function unlock() {
     return $this->memcached->delete($this->lock);
   }
-  
+
   function connect() {
     $this->memcached =& new Memcached;
     foreach ($this->settings['servers'] as $server) {
@@ -208,7 +208,7 @@
       }
     }
   }
-  
+
   function stats() {
     $memcached_stats = $this->memcached->getStats();
     $stats = array(