Created
February 5, 2012 18:08
-
-
Save thekid/1746945 to your computer and use it in GitHub Desktop.
PHP 5.4.0RC7/RC8-DEV Bugfixes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| These bugs have now been fixed! The RC provided inside PHP Bug #60879 contains | |
| fixes for both. This is kept for historic reasons. | |
| (http://windows.php.net/downloads/snaps/ostc/build/php-5.4.0-RC8-1/php-5.4.0RC8-nts-Win32-VC9-x86.zip) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: ext/standard/basic_functions.c | |
| =================================================================== | |
| --- ext/standard/basic_functions.c (revision 323069) | |
| +++ ext/standard/basic_functions.c (working copy) | |
| @@ -3451,9 +3451,10 @@ | |
| BG(user_tick_functions) = NULL; | |
| BG(user_filter_map) = NULL; | |
| BG(serialize_lock) = 0; | |
| - | |
| memset(&BG(serialize), 0, sizeof(BG(serialize))); | |
| memset(&BG(unserialize), 0, sizeof(BG(unserialize))); | |
| + BG(serialize).level = 0; | |
| + BG(unserialize).level = 0; | |
| memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); | |
| Index: Zend/zend_execute_API.c | |
| =================================================================== | |
| --- Zend/zend_execute_API.c (revision 323069) | |
| +++ Zend/zend_execute_API.c (working copy) | |
| @@ -1195,11 +1195,8 @@ | |
| } | |
| CG(interactive) = 0; | |
| - retval = SUCCESS; | |
| zend_try { | |
| zend_execute(new_op_array TSRMLS_CC); | |
| - } zend_catch { | |
| - retval = FAILURE; | |
| } zend_end_try(); | |
| CG(interactive) = orig_interactive; | |
| @@ -1221,6 +1218,7 @@ | |
| destroy_op_array(new_op_array TSRMLS_CC); | |
| efree(new_op_array); | |
| EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; | |
| + retval = SUCCESS; | |
| } else { | |
| retval = FAILURE; | |
| } |
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
See xp-framework/xp-framework#76, this is the patch to make 5.4.0-svn work for us.