summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-05-07 18:19:38 +0200
committerAleksander Machniak <alec@alec.pl>2013-05-07 18:20:21 +0200
commitc8f5588c8a712d5d5f36b6c2b44992384c503d6c (patch)
tree4a51233446285305e2c4ef3d391e1dbc66807783 /program/lib
parent187cf5e1cdee87fb1d26599f93202222bb7b8a4b (diff)
Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_imap_generic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 3a2e93dba..ddde6842e 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -746,7 +746,7 @@ class rcube_imap_generic
}
if ($this->prefs['timeout'] <= 0) {
- $this->prefs['timeout'] = ini_get('default_socket_timeout');
+ $this->prefs['timeout'] = max(0, intval(ini_get('default_socket_timeout')));
}
// Connect