diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 23:54:42 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 23:54:42 +0100 |
commit | 25f324fad7f2d753d1d8c87035a059f16cd7799c (patch) | |
tree | b6c059d111f497628d2298291fe8cab49c3dea01 | |
parent | cab354debd953701ec1ecc066c0ef0690f8ed35c (diff) | |
download | php-git-25f324fad7f2d753d1d8c87035a059f16cd7799c.tar.gz |
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.
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | php.ini-development | 2 | ||||
-rw-r--r-- | php.ini-production | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -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 3d4a905f9a..bad3017695 100644 --- 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 1febc0144f..2232d75a59 100644 --- 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. |