From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 5 Aug 2020 13:43:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bf8ff6d972b0d3bb2b0265a7b04af8adf0e47bf;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79930
---

6bf8ff6d972b0d3bb2b0265a7b04af8adf0e47bf
diff --cc NEWS
index 88795cae26,172a781622..52dc2d9e44
--- a/NEWS
+++ b/NEWS
@@@ -17,7 -17,11 +17,11 @@@ PH
    . Fixed bug #73060 (php failed with error after temp folder cleaned up).
      (cmb)
  
+ - Standard:
+   . Fixed bug #79930 (array_merge_recursive() crashes when called with array
+     with single reference). (Nikita)
+ 
 -06 Aug 2020, PHP 7.3.21
 +06 Aug 2020, PHP 7.4.9
  
  - Apache:
    . Fixed bug #79030 (Upgrade apache2handler's php_apache_sapi_get_request_time