Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)

pull/73/head
Aleksander Machniak 12 years ago
parent 3725cfb245
commit 95b90be8c2

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
- Fix various PHP code bugs found using static analysis (#1489086) - Fix various PHP code bugs found using static analysis (#1489086)
- Fix backslash character handling on vCard import (#1489085) - Fix backslash character handling on vCard import (#1489085)
- Fix csv import from Thunderbird with French localization (#1489059) - Fix csv import from Thunderbird with French localization (#1489059)

@ -746,7 +746,7 @@ class rcube_imap_generic
} }
if ($this->prefs['timeout'] <= 0) { 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 // Connect

Loading…
Cancel
Save