From d359dcb6b39b05c34046a9ba7848d818556f5d72 Mon Sep 17 00:00:00 2001 From: "bes.internal" 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) --- config/main.inc.php.dist | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'config/main.inc.php.dist') diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 7c22b8fd3..bbf345a41 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -68,10 +68,11 @@ $rcmail_config['smtp_debug'] = false; // to display a pulldown menu or set one host as string. // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// // Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['default_host'] = ''; // TCP port used for IMAP connections @@ -135,10 +136,11 @@ $rcmail_config['messages_cache'] = false; // If left blank, the PHP mail() function is used // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['smtp_server'] = ''; // SMTP port (default is 25; use 587 for STARTTLS or 465 for the @@ -267,10 +269,11 @@ $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str'; // Specify an array with 'host' => 'domain' values to support multiple hosts // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['username_domain'] = ''; // This domain will be used to form e-mail addresses of new users @@ -280,7 +283,7 @@ $rcmail_config['username_domain'] = ''; // %n - http hostname ($_SERVER['SERVER_NAME']) // %d - domain (http hostname without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['mail_domain'] = ''; // Password charset. @@ -532,10 +535,11 @@ $rcmail_config['ldap_public']['Verisign'] = array( 'name' => 'Verisign.com', // Replacement variables supported in host names: // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) + // %n - hostname ($_SERVER['SERVER_NAME']) + // %t - hostname without the first part + // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld + // For example %n = mail.domain.tld, %t = domain.tld 'hosts' => array('directory.verisign.com'), 'port' => 389, 'use_tls' => false, -- cgit v1.2.3 From 71ee565dfc5b40bee5ed8f66d75b4ff9f78a3976 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak 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 'config/main.inc.php.dist') 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