From 976ba376a94db6ac0891bc02437cea9f9cc08093 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 20 Jun 2013 08:18:46 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 config/main.inc.php.dist |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 1b73dd4..1812105 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -179,6 +179,8 @@
 $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;
 
 // ----------------------------------

--
Gitblit v1.9.1