Support connections to memcached socket file (#1488577)

1 files changed, 9 insertions, 3 deletions

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')));
       }