adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix boundaries used in multi-part messages.

Browse source 
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
This commit is contained in:
mark_story 2012-01-11 20:44:42 -05:00
parent 29cfdb4b41
commit 4d73f4e6a1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1323,7 +1323,7 @@ class CakeEmail {
$msg[] = '--' . $boundary; $msg[] = '--' . $boundary;
$msg[] = 'Content-Type: multipart/related; boundary="rel-' . $boundary . '"'; $msg[] = 'Content-Type: multipart/related; boundary="rel-' . $boundary . '"';
$msg[] = ''; $msg[] = '';
$relBoundary = 'rel-' . $boundary; $relBoundary = $textBoundary = 'rel-' . $boundary;
} }
if ($hasMultipleTypes) { if ($hasMultipleTypes) {

2
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -865,7 +865,7 @@ class CakeEmailTest extends CakeTestCase {
"\r\n" . "\r\n" .
"--alt-{$boundary}--\r\n" . "--alt-{$boundary}--\r\n" .
"\r\n" . "\r\n" .
"--$boundary\r\n" . "--rel-$boundary\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: application/octet-stream\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"Content-ID: <abc123>\r\n" . "Content-ID: <abc123>\r\n" .