From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 21 Sep 2019 14:16:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0RC3~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=698088ca7cda3a79555d817093ad0aff7dfd1e95;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency
---

698088ca7cda3a79555d817093ad0aff7dfd1e95
diff --cc NEWS
index 69bc3b41dd,5375faab44..3571e8f582
--- a/NEWS
+++ b/NEWS
@@@ -10,14 -10,10 +10,18 @@@ PH
    . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
  	(Kalle)
  
+ - MBString:
+   . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
+     (cmb)
+ 
 +- Mysqlnd:
 +  . Fixed bug #78525 (Memory leak in pdo when reusing native prepared
 +    statements). (Nikita)
 +
 +- PCRE:
 +  . Fixed bug #78272 (calling preg_match() before pcntl_fork() will freeze
 +    child process). (Nikita)
 +
  - Standard:
    . Fixed bug #76342 (file_get_contents waits twice specified timeout).
      (Thomas Calvet)