From 00f6457703e02b07c1a116143ed2565ee71aca8b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jul 2012 03:05:59 -0400
Subject: [PATCH] Support connections to memcached socket file (#1488577)
---
CHANGELOG | 1 +
program/include/rcmail.php | 9 +++++++--
config/main.inc.php.dist | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4a1b1a8..292c5f6 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 1ea2361..9dcd28c 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -244,8 +244,8 @@
$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/sock.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/rcmail.php b/program/include/rcmail.php
index b287acc..e77942e 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -348,8 +348,13 @@
// add alll 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, 4) != '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')));
}
--
Gitblit v1.9.1