mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-7.2'
* PHP-7.2: Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
This commit is contained in:
commit
129dd521bb
2 changed files with 2 additions and 2 deletions
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue