Changeset 3261 in subversion for trunk/roundcubemail/program/steps/mail/attachments.inc

Timestamp:

Feb 9, 2010 8:10:12 AM (3 years ago)

Author:

alec

Message:

• Fix attachment excessive memory use, support messages of any size (#1484660)

File:

• trunk/roundcubemail/program/steps/mail/attachments.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/attachments.inc

@@ -54 +54 @@
     
   if ($attachment['status']) {
-    $size = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
+    if (empty($attachment['size']))
+      $attachment['size'] = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
+
     header('Content-Type: ' . $attachment['mimetype']);
-    header('Content-Length: ' . $size);
+    header('Content-Length: ' . $attachment['size']);
     
     if ($attachment['data'])
@@ -81 +83 @@
     $attachment = array(
       'path' => $filepath,
+      'size' => $_FILES['_attachments']['size'][$i],
       'name' => $_FILES['_attachments']['name'][$i],
       'mimetype' => rc_mime_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i])