archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.4' into PHP-5.5

Browse source 
Conflicts:
	Zend/zend_vm_def.h
This commit is contained in:
Ard Biesheuvel 2013-06-21 11:26:37 +02:00
commit 162726241c
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_vm_def.h
View file

@ -3296,7 +3296,6 @@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST)
SAVE_OPLINE(); SAVE_OPLINE();
el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
EX(op_array), execute_data TSRMLS_CC); EX(op_array), execute_data TSRMLS_CC);
FREE_OP2();
ZEND_VM_JMP(EX(op_array)->opcodes + el->brk); ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
} }
@ -3308,7 +3307,6 @@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST)
SAVE_OPLINE(); SAVE_OPLINE();
el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
EX(op_array), execute_data TSRMLS_CC); EX(op_array), execute_data TSRMLS_CC);
FREE_OP2();
ZEND_VM_JMP(EX(op_array)->opcodes + el->cont); ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
} }