Changeset 71ee565 in github

Timestamp:

Jul 30, 2012 3:10:04 AM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

cfc27c9

Parents:

5f8d59c0

Message:

Support connections to memcached socket file (#1488577)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Support connections to memcached socket file (#1488577)
 - Enable TinyMCE inlinepopups plugin
 - Update to TinyMCE 3.5.6

config/main.inc.php.dist

@@ -245 +245 @@
 
 // Use these hosts for accessing memcached
-// Define any number of hosts in the form hostname:port
-$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' );
+// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
+$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
 
 // check client IP in session athorization

program/include/rcube.php

@@ -194 +194 @@
       $this->mc_available = 0;
 
-      // add alll configured hosts to pool
+      // add all configured hosts to pool
       $pconnect = $this->config->get('memcache_pconnect', true);
       foreach ($this->config->get('memcache_hosts', array()) as $host) {
-        list($host, $port) = explode(':', $host);
-        if (!$port) $port = 11211;
+        if (substr($host, 0, 7) != 'unix://') {
+          list($host, $port) = explode(':', $host);
+          if (!$port) $port = 11211;
+        }
+        else {
+          $port = 0;
+        }
+
         $this->mc_available += intval($this->memcache->addServer($host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
       }