diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-07-30 09:05:59 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-07-30 09:05:59 +0200 |
| commit | 00f6457703e02b07c1a116143ed2565ee71aca8b (patch) | |
| tree | 3f5066196542905f6c69c0f52985f52e0709f342 | |
| parent | 6ac21f275885bc8f58b17b1d2ddb5bfe9ca774cd (diff) | |
Support connections to memcached socket file (#1488577)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 4 | ||||
| -rw-r--r-- | program/include/rcmail.php | 9 |
3 files changed, 10 insertions, 4 deletions
@@ -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 1ea2361e2..9dcd28c95 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/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 b287acc2e..e77942e63 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -348,8 +348,13 @@ class rcmail // 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'))); } |