diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-14 00:01:46 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-14 00:01:46 +0100 |
| commit | 129dd521bb33949ed4e9e9ef0992ed0193fbd2df (patch) | |
| tree | 44a9d7f2471599e65f2dc0536dec7302a56080fc | |
| parent | 8afb91cdadaa5a40ee972dec278d89c76bf454e3 (diff) | |
| parent | 7448b033007059b966c51764f54598dc7389e7c9 (diff) | |
| download | php-git-129dd521bb33949ed4e9e9ef0992ed0193fbd2df.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development index ab9ec31078..6833b75bf4 100644 --- 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. diff --git a/php.ini-production b/php.ini-production index 7825686a46..ad29bf38a5 100644 --- 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. |