From 357cd5103d1c27f8416ef316c4a4c31588db45b8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Sep 2015 06:09:26 -0400
Subject: [PATCH] Fix issue where Content-Length of some attachments could be set to wrong value causing browser errors (#1490482)

---
 CHANGELOG                  |    1 +
 program/steps/mail/get.inc |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b7752c2..cb93bbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
 - Fix so In-Reply-To header is set also for MDN receipts (#1490523)
 - Fix missing HTTP_X_FORWARDED_FOR address in generated Received header
 - Fix XSS issue in drag-n-drop file uploads (#1490530)
+- Fix issue where Content-Length of some attachments could be set to wrong value causing browser errors (#1490482)
 
 RELEASE 1.1.2
 -------------
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index bef46cf..af59979 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -361,9 +361,8 @@
                     $sent = true;
                 }
                 else if ($part->size) {
-                    if ($size = (int)$part->d_parameters['size']) {
-                        header("Content-Length: $size");
-                    }
+                    // Don't be tempted to set Content-Length to $part->d_parameters['size'] (#1490482)
+                    // RFC2183 says "The size parameter indicates an approximate size"
 
                     $sent = $MESSAGE->get_part_body($part->mime_id, false, 0, -1);
                 }

--
Gitblit v1.9.1