From dcc5c9134b5578c657f9f5c45e64c79eb46684c7 Mon Sep 17 00:00:00 2001 From: stekkel Date: Fri, 24 Oct 2003 19:15:51 +0000 Subject: [PATCH] fix boundary_end in case of recursion Thnx Aaron van Meerten for spotting this. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6019 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index ae7b8b57..9a243c50 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -62,7 +62,7 @@ class Deliver { if ($i == $entCount-1) $last = true; } if ($boundary && $last) { - $s = "--".$boundary."--\r\n\r\n"; + $s = "--".$boundary_new."--\r\n\r\n"; $length_raw += strlen($s); if ($stream) { $this->preWriteToStream($s); @@ -307,8 +307,8 @@ class Deliver { } /* Identify SquirrelMail */ $header[] = 'User-Agent: SquirrelMail/' . $version . $rn; - // Spamassassin complains about no X-Mailer in combination with X-Priority - $header[] = 'X-Mailer: SquirrelMail/' . $version . $rn; + // Spamassassin complains about no X-Mailer in combination with X-Priority + $header[] = 'X-Mailer: SquirrelMail/' . $version . $rn; /* Do the MIME-stuff */ $header[] = 'MIME-Version: 1.0' . $rn; $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'. -- 2.25.1