From: Nikita Popov <nikic@php.net>
Date: Tue, 10 Mar 2015 17:18:43 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49bd45a2c1758c2082c32c64727c26eb7a2fe941;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

49bd45a2c1758c2082c32c64727c26eb7a2fe941
diff --cc NEWS
index 51cc5ca009,3a431bfad8..745ad94b86
--- a/NEWS
+++ b/NEWS
@@@ -5,7 -5,11 +5,9 @@@
  - Core:
    . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
      (Dmitry, Laruence)
 -  . Fixed bug #67626 (User exceptions not properly handled in streams). 
 -    (Julian)
    . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+   . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
+     __call/... arg passing). (Nikita)
  
  - Filter:
    . Fixed bug #69202: (FILTER_FLAG_STRIP_BACKTICK ignored unless other