From: Michael Wallner <mike@php.net>
Date: Mon, 5 Feb 2018 08:07:00 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.3RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef3f74a65d3cd8c1e5f116e7a363b1e0bde5a88;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix bug #75916 DNS_CAA record results contain garbage
---

3ef3f74a65d3cd8c1e5f116e7a363b1e0bde5a88
diff --cc NEWS
index 0211aba780,671f0f9977..fde430f530
--- a/NEWS
+++ b/NEWS
@@@ -19,13 -12,14 +19,17 @@@ PH
  - ODBC:
    . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
  
+ - Standard:
 -  . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, 
++  . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
+     Philip Sharp)
+ 
 -01 Feb 2018, PHP 7.1.14
 +01 Feb 2018, PHP 7.2.2
  
  - Core:
 +  . Fixed bug #75742 (potential memleak in internal classes's static members).
 +    (Laruence)
    . Fixed bug #75679 (Path 260 character problem). (Anatol)
 +  . Fixed bug #75614 (Some non-portable == in shell scripts). (jdolecek)
    . Fixed bug #75786 (segfault when using spread operator on generator passed
      by reference). (Nikita)
    . Fixed bug #75799 (arg of get_defined_functions is optional). (carusogabriel)