From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 21 Jun 2013 09:26:37 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=162726241ccfa567b3867a10f1f7ec6fa365533c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_def.h
---

162726241ccfa567b3867a10f1f7ec6fa365533c
diff --cc Zend/zend_vm_def.h
index ca62ddecc0,3d84a37905..9986e20bb7
--- 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);
  }