Changeset 81b573d in github

Timestamp:

Sep 16, 2008 4:49:28 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:

b62b5a0

Parents:

cf507b2

Message:

• Reduced memory footprint when forwarding attachments (#1485345)
• Fixed endless loop in iil_C_HandlePartBody()
• rcube_message::get_part_content() speed up using 3rd argument of rcube_imap::get_message_part()

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (4 diffs)
• program/include/rcube_message.php (modified) (1 diff)
• program/lib/imap.inc (modified) (6 diffs)
• program/steps/mail/compose.inc (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/09/16 (alec)
+----------
+- Reduced memory footprint when forwarding attachments (#1485345)
 
 2008/09/15 (thomasb)

program/include/rcube_imap.php

@@ -1284 +1284 @@
    * @param  object rcube_message_part Part object created by get_structure()
    * @param  mixed  True to print part, ressource to write part contents in
+   * @param  resource File pointer to save the message part
    * @return string Message/part body if not printed
    */
-  function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL)
+  function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL)
     {
     if (!($msg_id = $this->_uid2id($uid)))
@@ -1294 +1295 @@
     if (!is_object($o_part))
       {
+      write_log('errors', 'get_message_part: !is_object');
       $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id); 
       $structure = iml_GetRawStructureArray($structure_str);
@@ -1319 +1321 @@
     else
       {
-      $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 1);
+      if ($fp && $o_part->encoding == 'base64')
+        return iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 3, $fp);
+      else
+        $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 1);
 
       // decode part body
@@ -1334 +1339 @@
         $body = rcube_charset_convert($body, $o_part->charset);
         }
-      }
-
+      
+      if ($fp)
+        {
+        fwrite($fp, $body);
+        return true;
+        }
+      }
+    
     return $body;
     }

program/include/rcube_message.php

@@ -118 +118 @@
    *
    * @param string Part MIME-ID
+   * @param resource File pointer to save the message part
    * @return string Part content
    */
-  public function get_part_content($mime_id)
+  public function get_part_content($mime_id, $fp=NULL)
   {
     if ($part = $this->mime_parts[$mime_id])
-      return $this->imap->get_message_part($this->uid, $mime_id, $part);
+      return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
     else
       return null;

program/lib/imap.inc

@@ -66 +66 @@
                   optional resposne in iil_Connect(), added iil_C_GetCapability()
                 - remove 'undisclosed-recipients' string from 'To' header
+                - iil_C_HandlePartBody(): added 6th argument and fixed endless loop
 
 ********************************************************/
@@ -2354 +2355 @@
 }
 
-function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
+function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode, $file=NULL) {
         /* modes:
-        1: return string
+        1: return string (or write to $file pointer)
         2: print
-        3: base64 and print
+        3: base64 and print (or write to $file pointer)
         */
         
@@ -2364 +2365 @@
         $result = false;
         if (($part == 0) || empty($part)) {
-            $part = 'TEXT';
-        }
-    
+                $part = 'TEXT';
+        }
+        
         if (iil_C_Select($conn, $mailbox)) {
                 $reply_key = '* ' . $id;
@@ -2400 +2401 @@
                                 echo $result;
                         } else if ($mode == 3) {
-                                echo base64_decode($result);
-                        }
+                                if ($file)
+                                        fwrite($file, base64_decode($result));
+                                else
+                                        echo base64_decode($result);
+                        }                            
                 } else if ($line[$len-1] == '}') {
                         //multi-line request, find sizes of content and receive that many bytes
@@ -2409 +2413 @@
                         $sizeStr  = substr($line, $from, $len);
                         $bytes    = (int)$sizeStr;
-                        $received = 0;
-
-                        while ($received < $bytes) {
-                                $remaining = $bytes - $received;
-                                $line      = iil_ReadLine($fp, 1024);
+
+                        while ($bytes > 0) {
+                                $line      = iil_ReadLine($fp, 1024);
                                 $len       = strlen($line);
                 
-                                if ($len > $remaining) {
-                                        $line = substr($line, 0, $remaining);
+                                if ($len > $bytes) {
+                                        $line = substr($line, 0, $bytes);
                                 }
-                                $received += strlen($line);
+                                $bytes -= strlen($line);
+
                                 if ($mode == 1) {
-                                        $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
+                                        if ($file)
+                                                fwrite($file, rtrim($line, "\t\r\n\0\x0B") . "\n");
+                                        else
+                                                $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
                                 } else if ($mode == 2) {
                                         echo rtrim($line, "\t\r\n\0\x0B") . "\n";
                                 } else if ($mode == 3) {
-                                        echo base64_decode($line);
-                                }
+                                        if ($file)
+                                                fwrite($file, base64_decode($line));
+                                        else
+                                                echo base64_decode($line);
+                                }
                         }
                 }
-                // read in anything up until 'til last line
+                // read in anything up until last line
                 do {
                         $line = iil_ReadLine($fp, 1024);
                 } while (!iil_StartsWith($line, $key));
         
+                if ($mode == 3 && $file) {
+                        return true;
+                }
+        
                 if ($result) {
                         $result = rtrim($result, "\t\r\n\0\x0B");
-                        return $result; // substr($result, 0, strlen($result)-1);
+                        if ($file) {
+                                fwrite($file, $result);
+                                return true;
+                        }       
+                        return $result; // substr($result, 0, strlen($result)-1);
                 }
                 
@@ -2445 +2462 @@
     
         if ($mode==1) {
+                if ($file) {
+                        fwrite($file, $result);
+                        return true;
+                }
                 return $result;
         }
-        return $received;
-}
-
-function iil_C_FetchPartBody(&$conn, $mailbox, $id, $part) {
-        return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1);
+        
+        return false;
+}
+
+function iil_C_FetchPartBody(&$conn, $mailbox, $id, $part, $file=NULL) {
+        return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1, $file);
 }
 

program/steps/mail/compose.inc

@@ -597 +597 @@
       if ($fp = fopen($tmp_path, 'w'))
       {
-        fwrite($fp, $message->get_part_content($pid));
+        $message->get_part_content($pid, $fp);
         fclose($fp);