From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 20 Apr 2020 08:58:03 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18ad38a7b21babeef16e25981c549e51da5388f1;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79491: Search for .user.ini extends up to root dir
---

18ad38a7b21babeef16e25981c549e51da5388f1
diff --cc NEWS
index a94ab2ddc8,84b0a46b1a..034da7c676
--- a/NEWS
+++ b/NEWS
@@@ -11,10 -11,9 +11,13 @@@ PH
    . Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).
      (cmb)
  
 +- EXIF:
 +  . Fixed bug #79336 (ext/exif/tests/bug79046.phpt fails on Big endian arch).
 +    (Nikita)
 +
+ - FCGI:
+   . Fixed bug #79491 (Search for .user.ini extends up to root dir). (cmb)
+ 
  - MBString:
    . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported).
      (Girgias)