diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 23:55:26 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 23:56:31 +0100 |
| commit | 7448b033007059b966c51764f54598dc7389e7c9 (patch) | |
| tree | 206eb8104e644efc220e4e3899b402ac177f26a1 | |
| parent | b2622ed8387dd0f98e2d2c559efec0cd54560bdd (diff) | |
| parent | 25f324fad7f2d753d1d8c87035a059f16cd7799c (diff) | |
| download | php-git-7448b033007059b966c51764f54598dc7389e7c9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #76088 (ODBC functions are not available by default on Windows). (cmb) +- Standard: + . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb) 29 Mar 2018, PHP 7.2.4 diff --git a/php.ini-development b/php.ini-development index 72ab5753b8..57500369aa 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1042,7 +1042,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 491e92fa57..9733ec4d29 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. |