Bug #19665: Add Mail-Reply-To and Mail-Followup-To to structured reci…

…pient headers list
pear · Oct 23, 2012 · aad374f · aad374f
1 parent 5d1e8e0
commit aad374f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Mail/mimePart.php b/Mail/mimePart.php
@@ -815,6 +815,7 @@ function encodeHeader($name, $value, $charset='ISO-8859-1',
             'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
             'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
             'resent-sender', 'resent-reply-to',
+            'mail-reply-to', 'mail-followup-to',
             'return-receipt-to', 'disposition-notification-to',
         );
         $other_headers = array(

diff --git a/tests/headers_with_mbstring.phpt b/tests/headers_with_mbstring.phpt
@@ -40,6 +40,8 @@ array('From', "\"test test\"@domain.com"),
 array('From', "<\"test test\"@domain.com>"),
 array('From', "Doe<test@domain.com>"),
 array('From', "\"John Doe\"<test@domain.com>"),
+array('Mail-Reply-To', 'adresse@adresse.de <addresse@adresse>'),
+array('Mail-Reply-To', '"öäü" <adresse@adresse.de>'),
 );
 
 $i = 1;
@@ -140,3 +142,7 @@ foreach ($headers as $header) {
 [27] From: Doe <test@domain.com>
 [28] From: "John Doe" <test@domain.com>
 [28] From: "John Doe" <test@domain.com>
+[29] Mail-Reply-To: "adresse@adresse.de" <addresse@adresse>
+[29] Mail-Reply-To: "adresse@adresse.de" <addresse@adresse>
+[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= <adresse@adresse.de>
+[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= <adresse@adresse.de>
diff --git a/tests/headers_without_mbstring.phpt b/tests/headers_without_mbstring.phpt
@@ -40,6 +40,8 @@ array('From', "\"test test\"@domain.com"),
 array('From', "<\"test test\"@domain.com>"),
 array('From', "Doe<test@domain.com>"),
 array('From', "\"John Doe\"<test@domain.com>"),
+array('Mail-Reply-To', 'adresse@adresse.de <addresse@adresse>'),
+array('Mail-Reply-To', '"öäü" <adresse@adresse.de>'),
 );
 
 $i = 1;
@@ -141,3 +143,7 @@ foreach ($headers as $header) {
 [27] From: Doe <test@domain.com>
 [28] From: "John Doe" <test@domain.com>
 [28] From: "John Doe" <test@domain.com>
+[29] Mail-Reply-To: "adresse@adresse.de" <addresse@adresse>
+[29] Mail-Reply-To: "adresse@adresse.de" <addresse@adresse>
+[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= <adresse@adresse.de>
+[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= <adresse@adresse.de>