From dd38619aa5feb1a4142458f1c4baf31f1443b7f5 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Tue, 2 Feb 2010 22:54:36 +0000
Subject: [PATCH] Explicitly set mail.add_x_header in php.ini so test output
 matches expected results

---
 ext/standard/tests/mail/mail_basic.phpt      | 1 +
 ext/standard/tests/mail/mail_basic2.phpt     | 1 +
 ext/standard/tests/mail/mail_variation2.phpt | 1 +
 3 files changed, 3 insertions(+)

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")
-- 
2.50.1