From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 23 Feb 2020 22:33:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09e7c86779b281c3d1fbff5954fbb9e0b052cf33;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79299: com_print_typeinfo prints duplicate variables
---

09e7c86779b281c3d1fbff5954fbb9e0b052cf33
diff --cc NEWS
index e86daf5f7a,0208b395e8..85617b2af0
--- a/NEWS
+++ b/NEWS
@@@ -11,12 -7,10 +11,14 @@@ PH
      (cmb)
    . Fixed bug #79242 (COM error constants don't match com_exception codes on
      x86). (cmb)
 +  . Fixed bug #79247 (Garbage collecting variant objects segfaults). (cmb)
    . Fixed bug #79248 (Traversing empty VT_ARRAY throws com_exception). (cmb)
+   . Fixed bug #79299 (com_print_typeinfo prints duplicate variables). (Litiano
+     Moura)
  
 +- CURL:
 +  . Fixed bug #79019 (Copied cURL handles upload empty file). (cmb)
 +
  - DOM:
    . Fixed bug #77569: (Write Access Violation in DomImplementation). (Nikita,
      cmb)