Commit: 2c4f8234375d0847d7b690d314ea47db29dcbe47 Author: Xinchen Hui <larue...@php.net> Sun, 14 Jul 2013 11:53:56 +0800 Parents: efc89368ddcb094500adb3a8ad13559a581fd018 ebad5178c4ae0da124469b1432fb0e890f6147da Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2c4f8234375d0847d7b690d314ea47db29dcbe47 Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h Changed paths: MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h Diff: diff --cc Zend/zend_vm_execute.h index 866502a,6e466e4..f7d7301 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@@ -1422,8 -1392,7 +1422,7 @@@ static int ZEND_FASTCALL ZEND_BRK_SPEC SAVE_OPLINE(); el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, - EX(op_array), EX_Ts() TSRMLS_CC); + EX(op_array), execute_data TSRMLS_CC); - ZEND_VM_JMP(EX(op_array)->opcodes + el->brk); } @@@ -1434,8 -1403,7 +1433,7 @@@ static int ZEND_FASTCALL ZEND_CONT_SPE SAVE_OPLINE(); el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, - EX(op_array), EX_Ts() TSRMLS_CC); + EX(op_array), execute_data TSRMLS_CC); - ZEND_VM_JMP(EX(op_array)->opcodes + el->cont); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
