archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
This commit is contained in:
Christoph M. Becker 2018-03-13 23:55:26 +01:00
commit 7448b03300
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -6,6 +6,8 @@ PHP NEWS
. Fixed bug #76088 (ODBC functions are not available by default on Windows). . Fixed bug #76088 (ODBC functions are not available by default on Windows).
(cmb) (cmb)
- Standard:
. Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
29 Mar 2018, PHP 7.2.4 29 Mar 2018, PHP 7.2.4

2
php.ini-development
View file

@ -1042,7 +1042,7 @@ smtp_port = 25
;mail.force_extra_parameters = ;mail.force_extra_parameters =
; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename ; 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 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. ; the full path of the script, line number, To address and headers.

2
php.ini-production
View file

@ -1049,7 +1049,7 @@ smtp_port = 25
;mail.force_extra_parameters = ;mail.force_extra_parameters =
; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename ; 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 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. ; the full path of the script, line number, To address and headers.