From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 2 Oct 2019 17:02:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.11RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d295e1dce23cf49774419e7baf29373eabbbed8d;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Revert "Fix #78620: Out of memory error"
---

d295e1dce23cf49774419e7baf29373eabbbed8d
diff --cc NEWS
index 1144770d85,1c4ce6fe5d..579d435c72
--- a/NEWS
+++ b/NEWS
@@@ -5,9 -5,8 +5,8 @@@ PH
  - Core:
    . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
      (bugreportuser)
-   . Fixed bug #78620 (Out of memory error). (cmb)
  
 -- Exif:
 +- Exif :
    . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
  	(Kalle)