diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/get.inc | 24 |
3 files changed, 27 insertions, 2 deletions
@@ -22,6 +22,7 @@ CHANGELOG RoundCube Webmail - Fix handling of charsets with LATIN-* label - Fix messages background image handling in some cases (#1486990) - Fix format=flowed handling (#1486989) +- Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#1486995) RELEASE 0.4 ----------- diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 39d77eab1..eb785ca68 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -26,8 +26,8 @@ $SEARCH_MODS_DEFAULT = array('*' => array('subject'=>1, 'from'=>1), $SENT_MBOX = $EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-z]{2,5})'; -// actions that do not require imap connection -$NOIMAP_ACTIONS = array('addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment'); +// actions that do not require imap connection here +$NOIMAP_ACTIONS = array('addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment', 'get'); // always instantiate imap object (but not yet connect to server) $RCMAIL->imap_init(); diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 67c62b284..50731e012 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -35,6 +35,30 @@ if (!empty($_GET['_preload'])) { ob_end_clean(); +// Now we need IMAP connection +if (!$RCMAIL->imap_connect()) { + // Get action is often executed simultanously. + // Some servers have MAXPERIP or other limits. + // To workaround this we'll wait for some time + // and try again (once). + // Note: When message contains more inline parts and the server limit is low + // this stil maybe the issue, while we're using the same sleep interval, but + // I didn't found better solution. + if (!isset($_GET['_redirected'])) { + sleep(2); + header('Location: ' . $_SERVER['REQUEST_URI'] . '&_redirected=1'); + } + else { + raise_error(array( + 'code' => 500, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => 'Unable to get/display message part. IMAP connection error'), + true, true); + } + // Don't kill session, just quit (#1486995) + exit; +} + // similar code as in program/steps/mail/show.inc if (!empty($_GET['_uid'])) { $RCMAIL->config->set('prefer_html', true); |