summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git.php.net:/php-srcXinchen Hui2015-11-142-1/+18
|\
| * Merge branch 'PHP-7.0'Anatol Belski2015-11-151-1/+1
| |\
| | * fix test titleAnatol Belski2015-11-151-1/+1
| * | Merge branch 'PHP-7.0'Anatol Belski2015-11-142-1/+18
| |\ \ | | |/
| | * Fixed bug #70914 zend_throw_or_error() format string vulnerabilityTaoguang Chen2015-11-142-1/+18
* | | Fixed Bug #70918 (Segfault using static outside of class scope)Xinchen Hui2015-11-143-0/+42
|/ /
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-132-2/+15
|\ \ | |/
| * Fixed bug #70912 (Null ptr dereference instantiating class with invalid array...Xinchen Hui2015-11-132-2/+15
* | Squashed commit of the following:Dmitry Stogov2015-11-1312-61/+193
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-131-0/+2
|\ \ | |/
| * SKIP on slow debug version PHPXinchen Hui2015-11-131-0/+2
* | Separate common part of compile_file() and compile_string() into zend_compile()Dmitry Stogov2015-11-124-491/+443
* | Merge branch 'PHP-7.0'Anatol Belski2015-11-122-2/+2
|\ \ | |/
| * fixed typoAnatol Belski2015-11-122-2/+2
* | Merge branch 'PHP-7.0'Anatol Belski2015-11-121-0/+22
|\ \ | |/
| * add test for bug #70898Anatol Belski2015-11-121-0/+22
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-121-1/+1
|\ \ | |/
| * Also protects this oneXinchen Hui2015-11-121-1/+1
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-122-24/+4
|\ \ | |/
| * Re-fixed #70895Xinchen Hui2015-11-122-1/+16
| * Revert "Fixed bug Bug #70895 null ptr deref and segfault"Xinchen Hui2015-11-122-37/+1
| * Revert "refix bug #70895"Xinchen Hui2015-11-121-24/+25
| * Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"Xinchen Hui2015-11-121-2/+2
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-121-2/+2
|\ \ | |/
| * Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))Xinchen Hui2015-11-121-2/+2
* | Merge branch 'PHP-7.0'Anatol Belski2015-11-122-3/+38
|\ \ | |/
| * refix bug #70895Anatol Belski2015-11-121-25/+24
| * Fixed bug Bug #70895 null ptr deref and segfaultAnatol Belski2015-11-122-1/+37
* | Merge branch 'PHP-7.0'Anatol Belski2015-11-111-2/+2
|\ \ | |/
| * adjust test expectationAnatol Belski2015-11-111-1/+1
| * fix test filename and titleAnatol Belski2015-11-111-1/+1
* | Changed ZEND_FREE.op2.num and ZEND_FE_FREE.op2.num back to use live_range_off...Dmitry Stogov2015-11-1111-50/+174
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-111-8/+7
|\ \ | |/
| * Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB ...Xinchen Hui2015-11-111-8/+7
* | We don't nees zend_op_array->brk_cont_array at run-time anymore.Dmitry Stogov2015-11-105-64/+111
* | Make FE_FETCH and following assignments to be a part of a loop.Dmitry Stogov2015-11-103-18/+2
* | Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FA...Dmitry Stogov2015-11-107-49/+60
* | Merge branch 'PHP-7.0'Xinchen Hui2015-11-101-1/+0
|\ \ | |/
| * Unused varXinchen Hui2015-11-101-1/+0
* | Merge branch 'PHP-7.0'Dmitry Stogov2015-11-104-16/+35
|\ \ | |/
| * Fixed incorrect order of free/finally on exceptionDmitry Stogov2015-11-104-16/+35
| * Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0Anatol Belski2015-11-101-4/+4
| |\
* | \ Merge branch 'PHP-7.0'Andrea Faulds2015-11-091-4/+4
|\ \ \ | | |/ | |/|
| * | Merge branch 'use_ZEND_STRL_for_builtin_types' into PHP-7.0Andrea Faulds2015-11-091-4/+4
| |\ \
| | * | Use ZEND_STRL macro for builtin_typesAndrea Faulds2015-11-091-4/+4
* | | | Merge branch 'PHP-7.0'Anatol Belski2015-11-101-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | additional catch to bug #70863Anatol Belski2015-11-101-1/+1
| |/ /
* | | Merge branch 'PHP-7.0'Anatol Belski2015-11-091-0/+50
|\ \ \ | |/ /
| * | add test for eb32da13Anatol Belski2015-11-091-0/+50
* | | Merge branch 'PHP-7.0'Dmitry Stogov2015-11-092-0/+84
|\ \ \ | |/ /