From 29cfdb4b41193b1cebf9aa8423e225890c98c565 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Michl Date: Wed, 11 Jan 2012 15:41:21 +0100 Subject: [PATCH] Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries. Amavis spits out this error: X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue --- lib/Cake/Network/Email/CakeEmail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php index 8ce813456..d34f5e0c9 100644 --- a/lib/Cake/Network/Email/CakeEmail.php +++ b/lib/Cake/Network/Email/CakeEmail.php @@ -1288,7 +1288,7 @@ class CakeEmail { } $data = $this->_readFile($fileInfo['file']); - $msg[] = '--' . $this->_boundary; + $msg[] = '--rel-' . $this->_boundary; $msg[] = 'Content-Type: ' . $fileInfo['mimetype']; $msg[] = 'Content-Transfer-Encoding: base64'; $msg[] = 'Content-ID: <' . $fileInfo['contentId'] . '>';