Changeset 4312345 in github

Timestamp:

Sep 16, 2010 7:29:53 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

b8d96f6

Parents:

2280757

Message:

• Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#1486995)
• Performance: improve mail/get action and skip one IMAP connection

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/mail/get.inc (modified) (1 diff)

CHANGELOG

@@ -23 +23 @@
 - 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

program/steps/mail/func.inc

@@ -27 +27 @@
 $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)

program/steps/mail/get.inc

@@ -35 +35 @@
 
 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