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

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_execute_API.c
index f099784a42a8995f3ffb1de9a8fcf0b868c2df9f,09e703ca59a73cb3cefffd066e011d291582fc80..8739e21c2b9f9621f7e3e019147ad5daee8a7668
--- 1/Zend/zend_execute_API.c
--- 2/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);

diff --cc Zend/zend_language_scanner.c
Simple merge

diff --cc Zend/zend_language_scanner.l
Simple merge