From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 1 Jan 2018 20:30:18 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4422f86fde3e0d95aa6d636b64d37e91535b7b08;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

4422f86fde3e0d95aa6d636b64d37e91535b7b08
diff --cc NEWS
index fbbbeae4fa,0219e168f3..28f1098aa2
--- a/NEWS
+++ b/NEWS
@@@ -36,9 -21,10 +36,10 @@@ PH
  - SOAP:
    . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is
      used). (Anton Artamonov)
+   . Fixed bug #75502 (Segmentation fault in zend_string_release). (Nikita)
  
  - SPL:
 -  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by
 +  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by 
      reference). (Nikita)
    . Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent
      class). (Nikita)