From 25f324fad7f2d753d1d8c87035a059f16cd7799c Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 13 Mar 2018 23:54:42 +0100 Subject: [PATCH] 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. --- NEWS | 1 + php.ini-development | 2 +- php.ini-production | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f99252fb776..fc7b5a65515 100644 --- 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 3d4a905f9ad..bad30176953 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 1febc0144f9..2232d75a597 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.