com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Nikita Popov | Date: | Tue, 10 Mar 2015 17:19:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85446@lists.php.net to get a copy of this message | ||
Commit: 49bd45a2c1758c2082c32c64727c26eb7a2fe941
Author: Nikita Popov <nikic@php.net> Tue, 10 Mar 2015 18:18:43 +0100
Parents: b52a2940af7144486f0b2861bf737274aa00e87f bc9f2fb8dfadc1dba4264695ded28f673c54dc75
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=49bd45a2c1758c2082c32c64727c26eb7a2fe941
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc NEWS
index 51cc5ca,3a431bf..745ad94
--- 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