com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_c ompile.c Zend/zend_compile.h Zend/zend_execute_AP I.c Zend/zend_language_scanner.c
Zend/zend_langua ge_scanner.l
| From: | Dmitry Stogov | Date: | Wed, 27 Mar 2013 20:08:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_c ompile.c Zend/zend_compile.h Zend/zend_execute_AP I.c Zend/zend_language_scanner.c Zend/zend_langua ge_scanner.l |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71771@lists.php.net to get a copy of this message | ||
Commit: 6e8aa096964e1d723a9cae3572b2f0affa4e53c0
Author: Dmitry Stogov <dmitry@zend.com> Thu, 28 Mar 2013 00:08:11 +0400
Parents: 391a41e16701dc3a92a4af6dc4a7e23c98a0e314 85e5e60777209c13c71785da31af86a5e0a98d92
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e8aa096964e1d723a9cae3572b2f0affa4e53c0
Log:
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
Bugs:
https://bugs.php.net/64529
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_execute_API.c
MM Zend/zend_language_scanner.c
MM Zend/zend_language_scanner.l
Diff:
diff --cc Zend/zend_execute_API.c
index f099784,09e703c..8739e21
--- 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);