diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-05-20 00:55:48 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-05-20 00:57:34 -0700 |
| commit | ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4 (patch) | |
| tree | a874a449237cc7b03f5e9766807c7779a76eefcb /Zend/zend_language_scanner.c | |
| parent | 0f02c3aa29fdf656457bfda1d1147b77ad9d1959 (diff) | |
| parent | fb58e69a84f4fde603a630d2c9df2fa3be16d846 (diff) | |
| download | php-git-ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #64660 - yyparse can return 2, not only 1
Conflicts:
Zend/zend_language_scanner.c
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 9a62a9c045..ee91394320 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -587,7 +587,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR compiler_result = zendparse(TSRMLS_C); zend_do_return(&retval_znode, 0 TSRMLS_CC); CG(in_compilation) = original_in_compilation; - if (compiler_result==1) { /* parser error */ + if (compiler_result != 0) { /* parser error */ zend_bailout(); } compilation_successful=1; @@ -762,7 +762,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) SCNG(script_filtered) = NULL; } - if (compiler_result==1) { + if (compiler_result != 0) { CG(active_op_array) = original_active_op_array; CG(unclean_shutdown)=1; destroy_op_array(op_array TSRMLS_CC); |