Commit: 162726241ccfa567b3867a10f1f7ec6fa365533c Author: Ard Biesheuvel <ard.biesheu...@linaro.org> Fri, 21 Jun 2013 11:26:37 +0200 Parents: c65d663aefd27e39006b9c20a665893aa5265ed4 8623562b02dd6759617ef78ddcb06bdfe7710329 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=162726241ccfa567b3867a10f1f7ec6fa365533c Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: Zend/zend_vm_def.h Changed paths: MM Zend/zend_vm_def.h Diff: diff --cc Zend/zend_vm_def.h index ca62dde,3d84a37..9986e20 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@@ -3295,8 -3267,7 +3295,7 @@@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONS 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); - FREE_OP2(); ZEND_VM_JMP(EX(op_array)->opcodes + el->brk); } @@@ -3307,8 -3278,7 +3306,7 @@@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CON 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); - FREE_OP2(); 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
