From d359dcb6b39b05c34046a9ba7848d818556f5d72 Mon Sep 17 00:00:00 2001
From: "bes.internal" <bes.internal@gmail.com>
Date: Thu, 26 Jul 2012 17:54:12 +0300
Subject: use in parse_host HTTP_HOST for %d Use in parse_host function for
 domain resolve HTTP_HOST not hostname. add %t for hostname without first part
 For example roundcube box backend (rc.somedomain.tld) for reverse proxy on
 real domain (mail.example.com)

---
 program/include/rcube_utils.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'program/include')

diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index dfd2026cc..9344a929b 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -616,8 +616,10 @@ class rcube_utils
     {
         // %n - host
         $n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
-        // %d - domain name without first part, e.g. %n=mail.domain.tld, %d=domain.tld
-        $d = preg_replace('/^[^\.]+\./', '', $n);
+        // %t - host name without first part, e.g. %n=mail.domain.tld, %t=domain.tld
+	$t = preg_replace('/^[^\.]+\./', '', $n);
+	// %d - domain name without first part
+        $d = preg_replace('/^[^\.]+\./', '', $_SERVER['HTTP_HOST']);
         // %h - IMAP host
         $h = $_SESSION['storage_host'] ? $_SESSION['storage_host'] : $host;
         // %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
@@ -632,7 +634,7 @@ class rcube_utils
             }
         }
 
-        $name = str_replace(array('%n', '%d', '%h', '%z', '%s'), array($n, $d, $h, $z, $s[2]), $name);
+        $name = str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
         return $name;
     }
 
-- 
cgit v1.2.3


From 71ee565dfc5b40bee5ed8f66d75b4ff9f78a3976 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jul 2012 09:10:04 +0200
Subject: Support connections to memcached socket file (#1488577)

---
 CHANGELOG                 |  1 +
 config/main.inc.php.dist  |  4 ++--
 program/include/rcube.php | 12 +++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'program/include')

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')));
       }
 
-- 
cgit v1.2.3