Merge branch 'PHP-7.2'

* PHP-7.2: Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
8 years ago · 129dd521bb
2 changed files with 2 additions and 2 deletions
--- a/php.ini-development
+++ b/php.ini-development
@ -1036,7 +1036,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =

 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off

 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
--- a/php.ini-production
+++ b/php.ini-production
@ -1043,7 +1043,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =

 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off

 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.