Merge branch 'PHP-7.1' into PHP-7.2

* 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

View file

@ -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.