From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 27 Mar 2013 20:08:11 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~75^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e8aa096964e1d723a9cae3572b2f0affa4e53c0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
	NEWS
	Zend/zend_execute_API.c
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
---

6e8aa096964e1d723a9cae3572b2f0affa4e53c0
diff --cc Zend/zend_execute_API.c
index f099784a42,09e703ca59..8739e21c2b
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@@ -1294,9 -1312,9 +1294,9 @@@ void execute_new_code(TSRMLS_D) /* {{{ 
  		ZEND_VM_SET_OPCODE_HANDLER(opline);
  		opline++;
  	}
 -	
 +
- 	zend_release_labels(TSRMLS_C);
+ 	zend_release_labels(1 TSRMLS_CC);
 -	
 +
  	EG(return_value_ptr_ptr) = NULL;
  	EG(active_op_array) = CG(active_op_array);
  	orig_interactive = CG(interactive);