From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 25 Feb 2020 11:44:01 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e50c81f6fbb1ff6dd40fc5f02919a3351978254;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler
---

1e50c81f6fbb1ff6dd40fc5f02919a3351978254
diff --cc NEWS
index 7383cd6a94,12208cf46a..c70eaa7bb3
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.16
 +
 +?? ??? ????, PHP 7.4.4
  
  - Core:
 +  . Fixed bug #79244 (php crashes during parsing INI file). (Laruence)
+   . Fixed bug #63206 (restore_error_handler does not restore previous errors
+     mask). (Mark Plomer)
  
  - COM:
    . Fixed bug #66322 (COMPersistHelper::SaveToFile can save to wrong location).