summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-08-08 13:37:46 +0200
committerAleksander Machniak <alec@alec.pl>2013-08-08 13:37:46 +0200
commitbc94e296e74ab4a3313a3f807b0a5cc40f264879 (patch)
tree0f7d7421de7c649595204d77beebece748066677
parenta79017e662273c519a2c50d10ef12c11885d2d87 (diff)
Correct imap_timeout and smtp_timeout description, so 0 doesn't mean
no limit, but default_socket_timeout use (#1489247)
-rw-r--r--config/defaults.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 32dba4918..eedb816e2 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -143,7 +143,7 @@ $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 (no limit)
+// 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
@@ -208,7 +208,7 @@ $config['smtp_auth_pw'] = null;
// localhost if that isn't defined.
$config['smtp_helo_host'] = '';
-// SMTP connection timeout, in seconds. Default: 0 (no limit)
+// SMTP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
// Note: There's a known issue where using ssl connection with
// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
$config['smtp_timeout'] = 0;