Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git.php.net:/php-src | Xinchen Hui | 2015-11-14 | 2 | -1/+18 |
|\ | |||||
| * | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-15 | 1 | -1/+1 |
| |\ | |||||
| | * | fix test title | Anatol Belski | 2015-11-15 | 1 | -1/+1 |
| * | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-14 | 2 | -1/+18 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #70914 zend_throw_or_error() format string vulnerability | Taoguang Chen | 2015-11-14 | 2 | -1/+18 |
* | | | Fixed Bug #70918 (Segfault using static outside of class scope) | Xinchen Hui | 2015-11-14 | 3 | -0/+42 |
|/ / | |||||
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-13 | 2 | -2/+15 |
|\ \ | |/ | |||||
| * | Fixed bug #70912 (Null ptr dereference instantiating class with invalid array... | Xinchen Hui | 2015-11-13 | 2 | -2/+15 |
* | | Squashed commit of the following: | Dmitry Stogov | 2015-11-13 | 12 | -61/+193 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-13 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | SKIP on slow debug version PHP | Xinchen Hui | 2015-11-13 | 1 | -0/+2 |
* | | Separate common part of compile_file() and compile_string() into zend_compile() | Dmitry Stogov | 2015-11-12 | 4 | -491/+443 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-12 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | fixed typo | Anatol Belski | 2015-11-12 | 2 | -2/+2 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-12 | 1 | -0/+22 |
|\ \ | |/ | |||||
| * | add test for bug #70898 | Anatol Belski | 2015-11-12 | 1 | -0/+22 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Also protects this one | Xinchen Hui | 2015-11-12 | 1 | -1/+1 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-12 | 2 | -24/+4 |
|\ \ | |/ | |||||
| * | Re-fixed #70895 | Xinchen Hui | 2015-11-12 | 2 | -1/+16 |
| * | Revert "Fixed bug Bug #70895 null ptr deref and segfault" | Xinchen Hui | 2015-11-12 | 2 | -37/+1 |
| * | Revert "refix bug #70895" | Xinchen Hui | 2015-11-12 | 1 | -24/+25 |
| * | Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))" | Xinchen Hui | 2015-11-12 | 1 | -2/+2 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-12 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291)) | Xinchen Hui | 2015-11-12 | 1 | -2/+2 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-12 | 2 | -3/+38 |
|\ \ | |/ | |||||
| * | refix bug #70895 | Anatol Belski | 2015-11-12 | 1 | -25/+24 |
| * | Fixed bug Bug #70895 null ptr deref and segfault | Anatol Belski | 2015-11-12 | 2 | -1/+37 |
* | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-11 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | adjust test expectation | Anatol Belski | 2015-11-11 | 1 | -1/+1 |
| * | fix test filename and title | Anatol Belski | 2015-11-11 | 1 | -1/+1 |
* | | Changed ZEND_FREE.op2.num and ZEND_FE_FREE.op2.num back to use live_range_off... | Dmitry Stogov | 2015-11-11 | 11 | -50/+174 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-11 | 1 | -8/+7 |
|\ \ | |/ | |||||
| * | Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB ... | Xinchen Hui | 2015-11-11 | 1 | -8/+7 |
* | | We don't nees zend_op_array->brk_cont_array at run-time anymore. | Dmitry Stogov | 2015-11-10 | 5 | -64/+111 |
* | | Make FE_FETCH and following assignments to be a part of a loop. | Dmitry Stogov | 2015-11-10 | 3 | -18/+2 |
* | | Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FA... | Dmitry Stogov | 2015-11-10 | 7 | -49/+60 |
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2015-11-10 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Unused var | Xinchen Hui | 2015-11-10 | 1 | -1/+0 |
* | | Merge branch 'PHP-7.0' | Dmitry Stogov | 2015-11-10 | 4 | -16/+35 |
|\ \ | |/ | |||||
| * | Fixed incorrect order of free/finally on exception | Dmitry Stogov | 2015-11-10 | 4 | -16/+35 |
| * | Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 | Anatol Belski | 2015-11-10 | 1 | -4/+4 |
| |\ | |||||
* | \ | Merge branch 'PHP-7.0' | Andrea Faulds | 2015-11-09 | 1 | -4/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'use_ZEND_STRL_for_builtin_types' into PHP-7.0 | Andrea Faulds | 2015-11-09 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Use ZEND_STRL macro for builtin_types | Andrea Faulds | 2015-11-09 | 1 | -4/+4 |
* | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-10 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | additional catch to bug #70863 | Anatol Belski | 2015-11-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-09 | 1 | -0/+50 |
|\ \ \ | |/ / | |||||
| * | | add test for eb32da13 | Anatol Belski | 2015-11-09 | 1 | -0/+50 |
* | | | Merge branch 'PHP-7.0' | Dmitry Stogov | 2015-11-09 | 2 | -0/+84 |
|\ \ \ | |/ / |