summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2010-02-02 22:54:36 +0000
committerChristopher Jones <sixd@php.net>2010-02-02 22:54:36 +0000
commitdd38619aa5feb1a4142458f1c4baf31f1443b7f5 (patch)
tree431b65ed3b517186b82284536a51ec512c65b53c /ext
parent7c7d7ac1fa00954d431ca04acb39181f59b2f2a7 (diff)
downloadphp-git-dd38619aa5feb1a4142458f1c4baf31f1443b7f5.tar.gz
Explicitly set mail.add_x_header in php.ini so test output matches expected results
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/tests/mail/mail_basic.phpt1
-rw-r--r--ext/standard/tests/mail/mail_basic2.phpt1
-rw-r--r--ext/standard/tests/mail/mail_variation2.phpt1
3 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt
index 77ff3512d8..fecb50f32c 100644
--- a/ext/standard/tests/mail/mail_basic.phpt
+++ b/ext/standard/tests/mail/mail_basic.phpt
@@ -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")
diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt
index f5d98574d6..2ac4d20b1f 100644
--- a/ext/standard/tests/mail/mail_basic2.phpt
+++ b/ext/standard/tests/mail/mail_basic2.phpt
@@ -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]])
diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt
index 736b05f79a..d6eafd2e52 100644
--- a/ext/standard/tests/mail/mail_variation2.phpt
+++ b/ext/standard/tests/mail/mail_variation2.phpt
@@ -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")