summaryrefslogtreecommitdiff
path: root/program
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:19:38 +0200
commit95b90be8c22aa51f5b5e2d8bfa8031b50fa15e49 (patch)
treeea429f6d2b627e8ff9dc90cafb600576b59b435e /program
parent3725cfb245bfae3a77baf857ea5403e8064b84b9 (diff)
Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
Diffstat (limited to 'program')
-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 f7c1f86d7..6c1b85552 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