Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]

mail.add_x_header actually defaults to `Off`, so we should use this
default in the provided `php.ini`s.

diff --git a/NEWS b/NEWS
index f99252fb776d92470a04b203eb61b69a9edd3c4d..fc7b5a65515480b506d222c64d112f8968ecd3e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP                                                                        NEWS
     name contains a \n). (Laruence)
 
 - Standard:
+  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
   . Fixed bug #76068 (parse_ini_string fails to parse "[foo]\nbar=1|>baz" with
     segfault). (Anatol)
 

diff --git a/php.ini-development b/php.ini-development
index 3d4a905f9ad2431f9ae0fde3f642dbf08b9d8ac5..bad301769539571f78cd0f1dc0a46e7b5bf36a04 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -1049,7 +1049,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.

diff --git a/php.ini-production b/php.ini-production
index 1febc0144f904c99df356ab4999b15cb13e62306..2232d75a59721898760f21bcfbc47383883c0755 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -1049,7 +1049,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.