From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 30 Sep 2019 13:06:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0RC3~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0805e132b0de2fb738461f1465f72d3b65a72c39;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

0805e132b0de2fb738461f1465f72d3b65a72c39
diff --cc NEWS
index 1377e34170,1c4ce6fe5d..579d435c72
--- a/NEWS
+++ b/NEWS
@@@ -31,8 -19,10 +31,10 @@@ PH
  - Standard:
    . Fixed bug #76342 (file_get_contents waits twice specified timeout).
      (Thomas Calvet)
+   . Fixed bug #78612 (strtr leaks memory when integer keys are used and the
+     subject string shorter). (Nikita)
  
 -26 Sep 2019, PHP 7.2.23
 +26 Sep 2019, PHP 7.3.10
  
  - Core:
    . Fixed bug #78220 (Can't access OneDrive folder). (cmb, ab)