Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.3' into PHP-5.4 | Sara Golemon | 2013-05-19 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-5.3: Don't double-quote name of namespaced function. | ||||
| * | Don't double-quote name of namespaced function. | Sara Golemon | 2013-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) was resulting in a function declaration of: ns\"zend_name"() including the errant quotes. This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE in core and reason to believe that there are no uses in the wild either. | ||||
* | | Fixed bug #64720 (SegFault on zend_deactivate) | Dmitry Stogov | 2013-05-21 | 3 | -1/+58 |
| | | |||||
* | | fix bug #64660 - yyparse can return 2, not only 1 | Stanislav Malyshev | 2013-05-20 | 3 | -5/+16 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatol Belski | 2013-05-12 | 4 | -1/+70 |
|\ \ | |/ | | | | | | | * PHP-5.3: Fixed bug #64821 Custom Exceptions crash when internal properties overridden | ||||
| * | Fixed bug #64821 Custom Exceptions crash when internal properties overridden | Anatol Belski | 2013-05-12 | 4 | -1/+70 |
| | | | | | | | | | | | | If user inherits Exception and overrides the properties to arbitrary data types, or simply doesn't run parent::__construct(), here we go. Just convert everything to the appropriate data type, like Exception::__toString() does. | ||||
* | | Fix bug #64729: compilation failure on x32 | Gustavo Lopes | 2013-04-30 | 2 | -6/+16 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Dmitry Stogov | 2013-04-23 | 2 | -3/+9 |
|\ \ | |/ | | | | | | | | | | | | | | | * PHP-5.3: Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function. Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||||
| * | Fixed incorrect check. SEND_REF may be executed before DO_FCALL when ↵ | Dmitry Stogov | 2013-04-23 | 2 | -3/+9 |
| | | | | | | | | EX(function_state).function is not yet set to the calling function. | ||||
* | | Fixed bug (Wrong ce cached) | Xinchen Hui | 2013-04-11 | 2 | -2/+2 |
| | | |||||
* | | Update test script to make sure the error occurred | Xinchen Hui | 2013-04-04 | 1 | -1/+2 |
| | | |||||
* | | Use 5.4 specifical warnnig & Update NEWs | Xinchen Hui | 2013-04-04 | 1 | -9/+7 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-04-04 | 1 | -0/+15 |
|\ \ | |/ | |||||
| * | Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: ↵ | Xinchen Hui | 2013-04-04 | 2 | -3/+19 |
| | | | | | | | | segfault) | ||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-04-04 | 1 | -3/+4 |
|\ \ | |||||
| * | | Fixed Bug #64578 | Xinchen Hui | 2013-04-04 | 1 | -3/+4 |
| |/ | |||||
* | | Fix #64572: Clean up after the test | ptarjan | 2013-04-03 | 1 | -0/+1 |
| | | | | | | | | Lets not leave stuff lying around. | ||||
* | | Fixed bug #64529 (Ran out of opcode space) | Dmitry Stogov | 2013-03-28 | 6 | -11/+12 |
| | | |||||
* | | Update test script | Xinchen Hui | 2013-03-26 | 1 | -0/+2 |
| | | |||||
* | | Fixed bug #64515 (Memoryleak when using the same variablename 2times in ↵ | Xinchen Hui | 2013-03-26 | 3 | -2/+12 |
| | | | | | | | | function declaration) | ||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Dmitry Stogov | 2013-03-25 | 2 | -26/+30 |
|\ \ | |/ | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||||
| * | Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle ↵ | Dmitry Stogov | 2013-03-25 | 2 | -24/+30 |
| | | | | | | | | exceptions properly). (Jeff Welch) | ||||
* | | Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11) | Xinchen Hui | 2013-03-21 | 7 | -13/+214 |
| | | |||||
* | | fix C90 compat | Anatol Belski | 2013-03-19 | 1 | -1/+2 |
| | | |||||
* | | Fixed bug #63976 (Parent class incorrectly using child constant in class ↵ | Dmitry Stogov | 2013-03-19 | 2 | -2/+56 |
| | | | | | | | | property) | ||||
* | | Partial fix for bug #64239 | Dmitry Stogov | 2013-03-19 | 2 | -13/+46 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Dmitry Stogov | 2013-03-19 | 2 | -1/+27 |
|\ \ | |/ | | | | | | | * PHP-5.3: Fixed bug #62343 (Show class_alias In get_declared_classes()) | ||||
| * | Fixed bug #62343 (Show class_alias In get_declared_classes()) | Dmitry Stogov | 2013-03-19 | 2 | -1/+27 |
| | | |||||
* | | Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error) | Dmitry Stogov | 2013-03-19 | 2 | -1/+40 |
| | | |||||
* | | Disable zend_always_inline in debug build | Xinchen Hui | 2013-03-11 | 1 | -1/+5 |
| | | | | | | | | it will be much more easier for debuging | ||||
* | | Fixed confused exception message while user threw exception | Xinchen Hui | 2013-03-09 | 2 | -1/+25 |
| | | |||||
* | | Fixed bug #64235 (Insteadof not work for class method in 5.4.11) | Xinchen Hui | 2013-02-21 | 6 | -4/+77 |
| | | | | | | | | | | | | As we discussed with stefan, we think previous of allowing use with classes is a bug, should be forbided, anyway, the error message should be improved. | ||||
* | | Fixed bug #64070 (Inheritance with Traits failed with error) | Dmitry Stogov | 2013-02-18 | 2 | -6/+40 |
| | | |||||
* | | Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang) | Ard Biesheuvel | 2013-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Updated the code to test for __ARMCC_VERSION instead of __arm, as that is a more reliable indicator of whether the ARMCC compiler is being used. | ||||
* | | Fixed bug #64142 (dval to lval different behavior on ppc64) | Remi Collet | 2013-02-11 | 1 | -1/+2 |
| | | | | | | | | | | See discussion on internals http://marc.info/?t=136042277700003&r=1&w=2 | ||||
* | | revert | Remi Collet | 2013-02-05 | 1 | -1/+1 |
| | | |||||
* | | Fixed bug #64142 (dval to lval different behavior on ppc64) | Remi Collet | 2013-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | On x86_64: (long)(double)9223372036854775807+1 = -9223372036854775808 On ppc64 (long)(double)9223372036854775807-1 = 9223372036854775807 | ||||
* | | Fix build problem in C++11 | Jelle Zijlstra | 2013-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2013-01-29 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 | Johannes Schlüter | 2013-01-29 | 4 | -70/+99 |
| |\ | |||||
| * | | Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias) | Johannes Schlüter | 2013-01-29 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'bug64023' into PHP-5.4 | Gustavo Lopes | 2013-01-22 | 2 | -75/+15 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | * bug64023: Fix bug #64023 (__toString() & SplFileInfo) Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||||
| * | | Fix bug #64023 (__toString() & SplFileInfo) | Gustavo Lopes | 2013-01-22 | 2 | -70/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining a __toString() method was having no effect when concatenating the object. This was because the cast_object() handler would ignore __toString(). Using echo() directly would actually use __toString(), but this was a bug: the ECHO handler would try zend_std_cast_object_tostring() before cast_object(), but cast_object() should have priority as zend_std_cast_object_tostring() assumes an object with a zend_class_entry. | ||||
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2013-01-18 | 2 | -0/+84 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.3: fix bug #63462 (Magic methods called twice for unset protected properties) | ||||
| * | | fix bug #63462 (Magic methods called twice for unset protected properties) | Stanislav Malyshev | 2013-01-18 | 2 | -0/+84 |
| |/ | |||||
* | | fix bug #63982: isset() inconsistently produces a fatal error on protected ↵ | Stanislav Malyshev | 2013-01-13 | 2 | -1/+16 |
| | | | | | | | | property | ||||
* | | different OSes have different messages, and that's not what the test is ↵ | Stanislav Malyshev | 2013-01-13 | 2 | -3/+3 |
| | | | | | | | | about anyway | ||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Dmitry Stogov | 2013-01-09 | 2 | -3/+4 |
|\ \ | |/ | | | | | | | * PHP-5.3: Fixed compilator bug that might cause jump depended on unitialized value | ||||
| * | Fixed compilator bug that might cause jump depended on unitialized value | Dmitry Stogov | 2013-01-09 | 2 | -3/+4 |
| | | |||||
* | | Fixed bug #63882 (zend_std_compare_objects crash on recursion) | Dmitry Stogov | 2013-01-09 | 4 | -0/+43 |
| | |