| Commit message (Collapse) | 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 |
| | |\ | | | | | | | | | | | | | * PHP-7.0: fix test title | ||||
| | | * | fix test title | Anatol Belski | 2015-11-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | c/p mistake :) | ||||
| | * | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-14 | 2 | -1/+18 |
| | |\ \ | | |/ | | | | | | | | | | | | | * PHP-7.0: update NEWS Fixed bug #70914 zend_throw_or_error() format string vulnerability | ||||
| | | * | 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 ↵ | Xinchen Hui | 2015-11-13 | 2 | -2/+15 |
| | | | | | | | | | array property) | ||||
| * | | Squashed commit of the following: | Dmitry Stogov | 2015-11-13 | 12 | -61/+193 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit afe963e6cc289696e60c6c679796ba2197c52b3b Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Nov 13 15:32:29 2015 +0300 Added news entry commit a126b891c97848dd7ef8f1abf716328c46e0f19c Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Nov 13 15:29:21 2015 +0300 VERIFY_RETURN_TYPE doesn't have to cleanup operand on exception, bacause now, live temporary variables are released by exception unwinder. commit 0db475e98786e6bcaa8401ee3e0b33743b9a2f2b Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Nov 12 22:55:39 2015 +0300 Fixed copy/paste commit 0ac73fe7174bec9de9a610319a98b259bea67f7f Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Nov 11 16:11:50 2015 +0300 Fixed bug #62210 (Exceptions can leak temporary variables) | ||||
| * | | 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 |
| |\ \ | |/ | | | | | | | * PHP-7.0: fixed typo | ||||
| | * | fixed typo | Anatol Belski | 2015-11-12 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-12 | 1 | -0/+22 |
| |\ \ | |/ | | | | | | | * PHP-7.0: add test for bug #70898 | ||||
| | * | 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 |
| |\ \ | |/ | | | | | | | Conflicts: NEWS | ||||
| | * | 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 |
| | | | | | | | | | This reverts commit 8eef11d3179fe7c6fed8393c1bbae96fcab05c49. | ||||
| | * | Revert "refix bug #70895" | Xinchen Hui | 2015-11-12 | 1 | -24/+25 |
| | | | | | | | | | This reverts commit 93240102e0830802ca1b27ccabd9a899a1de7570. | ||||
| | * | Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))" | Xinchen Hui | 2015-11-12 | 1 | -2/+2 |
| | | | | | | | | | This reverts commit e4e54f33ceb4ecce33397c867b45862af85c1fda. | ||||
| * | | 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 |
| | | | | | | | | | Include tail \0 | ||||
| * | | Merge branch 'PHP-7.0' | Anatol Belski | 2015-11-12 | 2 | -3/+38 |
| |\ \ | |/ | | | | | | | | | | | * PHP-7.0: update NEWS refix bug #70895 Fixed bug Bug #70895 null ptr deref and segfault | ||||
| | * | refix bug #70895 | Anatol Belski | 2015-11-12 | 1 | -25/+24 |
| | | | | | | | | | | | move this code to where it belongs, no behavior change to actual throwing function, thus retaining compat with old ZPP | ||||
| | * | 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 |
| |\ \ | |/ | | | | | | | | | | | * PHP-7.0: update NEWS, patch for #70249 pulled into RC7 adjust test expectation fix test filename and title | ||||
| | * | 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 ↵ | Dmitry Stogov | 2015-11-11 | 11 | -50/+174 |
| | | | | | | | | | live_range_offset (try_catch_offset does't work) | ||||
| * | | 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 |
| | | | | | | | | | | | | | 3.2-dev) Let's fixed this in the root instead | ||||
| * | | We don't nees zend_op_array->brk_cont_array at run-time anymore. | Dmitry Stogov | 2015-11-10 | 5 | -64/+111 |
| | | | | | | | | | | | | | Move zend_op_array->brk_cont_array into CG(context).brk_cont_array. Use more compact zend_op_array->live_range instead of zend_op_array->brk_cont_array. Semantic is kept unchanged. | ||||
| * | | 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, ↵ | Dmitry Stogov | 2015-11-10 | 7 | -49/+60 |
| | | | | | | | | | | | | | | | ZEND_FAST_RET. Previously it was an instruction number. Now it's an index in op_array->try_cacth_array[]. | ||||
| * | | 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 |
| |\ \ | |/ | | | | | | | * PHP-7.0: Fixed incorrect order of free/finally on exception | ||||
| | * | 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 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | * PHP-7.0: additional catch to bug #70863 | ||||
| | * | | | 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 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: add test for eb32da13 | ||||
| | * | | 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 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Added tests | ||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |