com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_object_handlers.c Zend/zend_opcode.c
| From: | Dmitry Stogov | Date: | Tue, 21 May 2013 06:15:37 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_object_handlers.c Zend/zend_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72212@lists.php.net to get a copy of this message | ||
Commit: a2d6d274584d5df2aa9c040396066d30ffd44d82
Author: Dmitry Stogov <dmitry@zend.com> Tue, 21 May 2013 10:15:37 +0400
Parents: 49c1a223d5ba14df3689de5bdb80f5031378a955 77fffff15762137e2d8173df9b733b4cb70fc996
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2d6d274584d5df2aa9c040396066d30ffd44d82
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
Bugs:
https://bugs.php.net/64720
Changed paths:
MM NEWS
MM Zend/zend_object_handlers.c
MM Zend/zend_opcode.c
Diff:
diff --cc NEWS
index 7a19c7b,5bf6872..4e9ba71
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,14 +1,13 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.4.16
+?? ??? 2013, PHP 5.5.0 Release Candidate 2
- Core:
- . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
- . Fixed bug #64729 (compilation failure on x32). (Gustavo)
. Fixed bug #64660 (Segfault on memory exhaustion within function definition).
(Stas, reported by Juha Kylmänen)
- . Fixed bug #64853 (Use of no longer available ini directives causes crash on
- TS build). (Anatol)
++ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
+ . Fixed bug #64853 (Use of no longer available ini directives causes crash
+ on TS build). (Anatol)
- Fileinfo:
. Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)