From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 2 Mar 2017 11:36:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf8c463f5bcb32b83cd6252d7f8cfb171523f353;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

bf8c463f5bcb32b83cd6252d7f8cfb171523f353
diff --cc NEWS
index bf41d80144,0aa1a01c63..3df1bdfef9
--- a/NEWS
+++ b/NEWS
@@@ -1,17 -1,14 +1,19 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.18
 +?? ??? 2017, PHP 7.1.4
  
- 
+ - DOM:
+   . Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*).
+     (somedaysummer)
  
 -16 Mar 2017 PHP 7.0.17
 +16 Mar 2017, PHP 7.1.3
  
  - Core:
 +  . Fixed bug #74157 (Segfault with nested generators). (Laruence)
 +  . Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to
 +    typehinted by-ref arg). (Laruence)
 +  . Fixed bug #74093 (Maximum execution time of n+2 seconds exceed not written
 +    in error_log). (Laruence)
    . Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite).
      (Dmitry, Laruence)
    . Fixed bug #74084 (Out of bound read - zend_mm_alloc_small). (Laruence)