Changeset 322b79d in github

Timestamp:

Nov 20, 2008 3:46:59 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

300fc65

Parents:

4e5b11a

Message:

• Speed up raw message body handling (call FETCH only once for the whole message insteade of twice for headers and body)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (2 diffs)
• program/lib/imap.inc (modified) (3 diffs)

CHANGELOG

@@ -5 +5 @@
 ----------
 - Fix handling of some malformed messages (#1484438)
+- Speed up raw message body handling
 
 2008/11/15 (alec)

program/include/rcube_imap.php

@@ -1437 +1437 @@
       return FALSE;
 
-    $body = iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);
-    $body .= iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, 1);
-
-    return $body;    
+    return iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id);
     }
 
@@ -1471 +1468 @@
       return FALSE;
 
-    print iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);
-    flush();
     iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, 2);
     }

program/lib/imap.inc

@@ -72 +72 @@
                 - added 3rd argument in iil_StartsWith* functions
                 - fix iil_C_FetchPartHeader() in some cases by use of iil_C_HandlePartBody()
+                - allow iil_C_HandlePartBody() to fetch whole message
 
 ********************************************************/
@@ -2376 +2377 @@
 }
 
-function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode, $file=NULL) {
+function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part='', $mode=1, $file=NULL) {
         /* modes:
         1: return string (or write to $file pointer)
@@ -2385 +2386 @@
         $fp     = $conn->fp;
         $result = false;
-        if (empty($part)) {
-                $part = 'TEXT';
-        }
 
         if (iil_C_Select($conn, $mailbox)) {