summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-20 14:18:46 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-20 14:18:46 +0200
commit976ba376a94db6ac0891bc02437cea9f9cc08093 (patch)
tree80f06524ecc7f62c70be14a9ee8da43bf92cd563
parentd76472314240f3a3c7f2a2e771df791fbe019337 (diff)
parent3bbe4e7424f12b4f870fb775b8230714a2862380 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--config/main.inc.php.dist2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 1b73dd46a..1812105c1 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -179,6 +179,8 @@ $rcmail_config['smtp_auth_pw'] = null;
$rcmail_config['smtp_helo_host'] = '';
// SMTP connection timeout, in seconds. Default: 0 (no limit)
+// Note: There's a known issue where using ssl connection with
+// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
$rcmail_config['smtp_timeout'] = 0;
// ----------------------------------