fix tests in Zend #6
Merged
Conversation
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
…ding * upstream/PHP-5.6: (535 commits) Added one more test for constant scalar expressions added missing prototype fix dir separator in cve-2013-6420 test Zend: fix overflow handling bug in non-x86 fast_add_function() 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse NEWS Fixed Bug #66218 zend_register_functions breaks reflection Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) Fixed bug #66251 (Constants get statically bound at compile time when Optimized) Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6. Fixed memory leaks introdused by: commit 611da37 Author: Igor Wiedler <[email protected]> Date: Sat Nov 9 13:48:23 2013 -0500 Zend: fix overflow handling bug in non-x86 fast_add_function() Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class). Arguments passed to user function have to be properly allocated on heap cli: don't cast away const in select() timeout argument Replace invalid code with a proper #error Switch to using freetype-config for freetype detection. BFN Fixed bug #61645 (fopen and O_NONBLOCK) ... Conflicts: Zend/Makefile.am Zend/zend_execute_API.c configure.in
… into function-autoloading
…on-autoloading
…on-autoloading
|
|
||
| 12 Dec 2013, PHP 5.5.7 | ||
| >>>>>>> PHP-5.5 | ||
| >>>>>>> PHP-5.6 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
all tests in /Zend passing