diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-11-14 18:03:38 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-11-14 18:03:38 +0400 |
| commit | ba8a06fd95ed4bce920569b4c9f8e71f927bd498 (patch) | |
| tree | 39b836486123e14c8e44d42cab9adf1bb08df95b /Zend/zend_language_scanner.l | |
| parent | e73beb82dfec93e4e196604107355b21bb2f166e (diff) | |
| parent | f99befadbd7f9896558ec2c3640c8e028ac09b1f (diff) | |
| download | php-git-ba8a06fd95ed4bce920569b4c9f8e71f927bd498.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed compiler reenterability
Fixed compiler reenterability
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index dbf43977fb..9f1437bb5f 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -580,6 +580,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); CG(in_compilation) = 1; CG(active_op_array) = op_array; + zend_stack_push(&CG(context_stack), (void *) &CG(context), sizeof(CG(context))); zend_init_compiler_context(TSRMLS_C); compiler_result = zendparse(TSRMLS_C); zend_do_return(&retval_znode, 0 TSRMLS_CC); @@ -749,6 +750,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) init_op_array(op_array, ZEND_EVAL_CODE, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); CG(interactive) = orig_interactive; CG(active_op_array) = op_array; + zend_stack_push(&CG(context_stack), (void *) &CG(context), sizeof(CG(context))); zend_init_compiler_context(TSRMLS_C); BEGIN(ST_IN_SCRIPTING); compiler_result = zendparse(TSRMLS_C); |