From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 13 Mar 2018 22:55:26 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7448b033007059b966c51764f54598dc7389e7c9;p=php

Merge branch 'PHP-7.1' into PHP-7.2

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

7448b033007059b966c51764f54598dc7389e7c9
diff --cc NEWS
index 85bdec447b,fc7b5a6551..46db91b990
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,6 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.16
 +?? ??? 2018, PHP 7.2.5
 +
 +- ODBC:
 +  . 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
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).