summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-06-16 14:13:58 +0200
committerAleksander Machniak <alec@alec.pl>2014-09-01 14:24:36 +0200
commit3b55da7ba60bafaae5b20e0e39a3d6304001d08a (patch)
treef4cf6614a69702d0a02dfc9e82dc4746cf4f8d4d /config
parent4922ebda5c08c5da31fd33682b8cc569b8293e62 (diff)
Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
Conflicts: CHANGELOG
Diffstat (limited to 'config')
-rw-r--r--config/defaults.inc.php37
1 files changed, 25 insertions, 12 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 14612e078..760325156 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -123,6 +123,27 @@ $config['default_port'] = 143;
// best server supported one)
$config['imap_auth_type'] = null;
+// IMAP socket context options
+// See http://php.net/manual/en/context.ssl.php
+// The example below enables server certificate validation
+//$config['imap_conn_options'] = array(
+// 'ssl' => array(
+// 'verify_peer' => true,
+// 'verify_depth' => 3,
+// 'cafile' => '/etc/openssl/certs/ca.crt',
+// ),
+// );
+$config['imap_conn_options'] = null;
+
+// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
+$config['imap_timeout'] = 0;
+
+// Optional IMAP authentication identifier to be used as authorization proxy
+$config['imap_auth_cid'] = null;
+
+// Optional IMAP authentication password to be used for imap_auth_cid
+$config['imap_auth_pw'] = null;
+
// If you know your imap's folder delimiter, you can specify it here.
// Otherwise it will be determined automatically
$config['imap_delimiter'] = null;
@@ -160,15 +181,6 @@ $config['imap_force_ns'] = false;
// Note: Because the list is cached, re-login is required after change.
$config['imap_disabled_caps'] = array();
-// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
-$config['imap_timeout'] = 0;
-
-// Optional IMAP authentication identifier to be used as authorization proxy
-$config['imap_auth_cid'] = null;
-
-// Optional IMAP authentication password to be used for imap_auth_cid
-$config['imap_auth_pw'] = null;
-
// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
$config['imap_cache'] = null;
@@ -244,13 +256,14 @@ $config['smtp_timeout'] = 0;
// requires 'smtp_timeout' to be non zero.
// $config['smtp_conn_options'] = array(
// 'ssl' => array(
-// 'verify_peer' => true,
-// 'verify_depth => 3,
-// 'cafile' => '/etc/openssl/certs/ca.crt',
+// 'verify_peer' => true,
+// 'verify_depth' => 3,
+// 'cafile' => '/etc/openssl/certs/ca.crt',
// ),
// );
$config['smtp_conn_options'] = null;
+
// ----------------------------------
// LDAP
// ----------------------------------