]> granicus.if.org Git - php/commitdiff
Explicitly set mail.add_x_header in php.ini so test output matches expected results
authorChristopher Jones <sixd@php.net>
Tue, 2 Feb 2010 22:54:36 +0000 (22:54 +0000)
committerChristopher Jones <sixd@php.net>
Tue, 2 Feb 2010 22:54:36 +0000 (22:54 +0000)
ext/standard/tests/mail/mail_basic.phpt
ext/standard/tests/mail/mail_basic2.phpt
ext/standard/tests/mail/mail_variation2.phpt

index 77ff3512d8650a2daec6901ca7a059e62b16fc68..fecb50f32ce8c26c8eda2baf8ba297e9f46bad9e 100644 (file)
@@ -2,6 +2,7 @@
 Test mail() function : basic functionality 
 --INI--
 sendmail_path=tee mailBasic.out >/dev/null
+mail.add_x_header = Off
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
index f5d98574d60e892beca178c9b88d5fe6df925974..2ac4d20b1f7a2d2cabb7eea98ff78eccd965a860 100644 (file)
@@ -7,6 +7,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 ?>
 --INI--
 sendmail_path="sed > /tmp/php_test_mailBasic2.out"
+mail.add_x_header = Off
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
index 736b05f79a2bb95965cb76cc72ea6699592d164c..d6eafd2e5240fed3bbd857d3a9a25feb79687802 100644 (file)
@@ -3,6 +3,7 @@ Test mail() function : variation force extra parameters
 --INI--
 sendmail_path="sed > /tmp/php_test_mailVariation2.out"
 mail.force_extra_parameters="-e4a---forced-params"
+mail.add_x_header = Off
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")