Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]

Author: cmb69

Diff for: NEWS

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

Diff for: php.ini-development

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

Diff for: php.ini-production

@@ -1049,7 +1049,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.