Support connections to memcached socket file (#1488577)

3 files changed, 12 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9f7b7868d..52a6c1ff3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Support connections to memcached socket file (#1488577)
 - Enable TinyMCE inlinepopups plugin
 - Update to TinyMCE 3.5.6
 - Correctly escape localized labels in javascript variable (#1488567)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 7c22b8fd3..16557bd20 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -244,8 +244,8 @@ $rcmail_config['session_name'] = null;
 $rcmail_config['session_storage'] = 'db';
 
 // 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
 $rcmail_config['ip_check'] = false;
diff --git a/program/include/rcube.php b/program/include/rcube.php
index a39eab15c..ab5879dc5 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -193,11 +193,17 @@ class rcube
       $this->memcache = new Memcache;
       $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')));
       }