Skip to content

Commit 129dd52

Browse files
committed
Merge branch 'PHP-7.2'
* PHP-7.2: Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
2 parents 8afb91c + 7448b03 commit 129dd52

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

php.ini-development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ smtp_port = 25
10361036
;mail.force_extra_parameters =
10371037

10381038
; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
1039-
mail.add_x_header = On
1039+
mail.add_x_header = Off
10401040

10411041
; The path to a log file that will log all mail() calls. Log entries include
10421042
; the full path of the script, line number, To address and headers.

php.ini-production

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ smtp_port = 25
10431043
;mail.force_extra_parameters =
10441044

10451045
; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
1046-
mail.add_x_header = On
1046+
mail.add_x_header = Off
10471047

10481048
; The path to a log file that will log all mail() calls. Log entries include
10491049
; the full path of the script, line number, To address and headers.

0 commit comments

Comments
 (0)