MFB: Fixed bug #51512 (mb_send_mail* fail when mail.add_x_header is on by default)

diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index 26d2ed2ecdfb46efcee28343f7ee1115be56598c..90cc3aa9c661a051880bec481658afefd4204608 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -8,6 +8,7 @@ if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 6a2dbcfeb0c5693a35d58b3b2190d368d81da1cc..81f2464d5b8ec6c854fc4fb74890736c7a67d9f4 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -8,6 +8,7 @@ if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index 4be1f8346745220b636fd0a3d1c233df44baab04..1334fadd7050d94499aacdcf4b1931e5b6fd7176 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -8,6 +8,7 @@ if (!function_exists("mb_send_mail") || !mb_language("english")) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index 06aa3a41559ccdca656b5a1b2a1bfaa0e2c953e0..0dcc318cc094eb1955d4b04b87fed42e40df21c8 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -8,6 +8,7 @@ if (!function_exists("mb_send_mail") || !mb_language("german")) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index cd3eaf4edcadd4c00e6ff9e7f828a5af3468b6e7..a93fa791a134a70359acc444baa27328651239e9 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -11,6 +11,7 @@ if (!@mb_internal_encoding('GB2312')) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 08cf24013a1524aa69fffb129aab28fc2507104e..9970340d55cf8a2fbbee2a98a39708075c239c99 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -11,6 +11,7 @@ if (!@mb_internal_encoding('BIG5')) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index ef296526598af92a0d645e699d238beef3dc6c18..afd9a0b15ca9937d46d6a14b259fc1dcea278364 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -11,6 +11,7 @@ if (!@mb_internal_encoding('ISO-2022-KR')) {
 ?>
 --INI--
 sendmail_path=/bin/cat
+mail.add_x_header=off
 --FILE--
 <?php
 $to = 'example@example.com';