sixd                                     Tue, 02 Feb 2010 22:54:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=294353

Log:
Explicitly set mail.add_x_header in php.ini so test output matches expected 
results

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic.phpt
    U   php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic2.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/mail/mail_basic.phpt
    U   php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt
    U   php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic.phpt        
2010-02-02 22:14:26 UTC (rev 294352)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic.phpt        
2010-02-02 22:54:36 UTC (rev 294353)
@@ -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")

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic2.phpt       
2010-02-02 22:14:26 UTC (rev 294352)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_basic2.phpt       
2010-02-02 22:54:36 UTC (rev 294353)
@@ -7,6 +7,7 @@
 ?>
 --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]])

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_variation2.phpt   
2010-02-02 22:14:26 UTC (rev 294352)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/mail/mail_variation2.phpt   
2010-02-02 22:54:36 UTC (rev 294353)
@@ -3,6 +3,7 @@
 --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")

Modified: php/php-src/trunk/ext/standard/tests/mail/mail_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/mail/mail_basic.phpt   2010-02-02 
22:14:26 UTC (rev 294352)
+++ php/php-src/trunk/ext/standard/tests/mail/mail_basic.phpt   2010-02-02 
22:54:36 UTC (rev 294353)
@@ -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")

Modified: php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt  2010-02-02 
22:14:26 UTC (rev 294352)
+++ php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt  2010-02-02 
22:54:36 UTC (rev 294353)
@@ -7,6 +7,7 @@
 ?>
 --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]])

Modified: php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt      
2010-02-02 22:14:26 UTC (rev 294352)
+++ php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt      
2010-02-02 22:54:36 UTC (rev 294353)
@@ -3,6 +3,7 @@
 --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")

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to