From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 12 Apr 2010 14:05:00 +0000 (+0000)
Subject: MFB: Fixed bug #51512 (mb_send_mail* fail when mail.add_x_header is on by default)
X-Git-Tag: php-5.4.0alpha1~191^2~1780
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b8b6d931a65ea2d7d44adfe34005a96396dd401;p=php

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 26d2ed2ecd..90cc3aa9c6 100644
--- 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 6a2dbcfeb0..81f2464d5b 100644
--- 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 4be1f83467..1334fadd70 100644
--- 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 06aa3a4155..0dcc318cc0 100644
--- 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 cd3eaf4edc..a93fa791a1 100644
--- 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 08cf24013a..9970340d55 100644
--- 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 ef29652659..afd9a0b15c 100644
--- 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';