From: Xinchen Hui <laruence@php.net>
Date: Sun, 14 Jul 2013 03:53:56 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c4f8234375d0847d7b690d314ea47db29dcbe47;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
---

2c4f8234375d0847d7b690d314ea47db29dcbe47
diff --cc Zend/zend_vm_execute.h
index 866502a4d9,6e466e40b1..f7d73017cd
--- 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);
  }