The default return value from include() and eval() changed from 1 to 0

unintentionally after the old return-reference patches - fixed

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 56c93b017d312637e475617fed0e40ca3ce679cb..dd99bf9fdbea9b5abba7d8d7f91446789e91acda 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -369,7 +369,12 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
 
        if (retval) {
                if (compiled_files>0) {
-                       do_return(NULL, 0 CLS_CC);
+                       znode retval_znode;
+
+                       retval_znode.op_type = IS_CONST;
+                       retval_znode.u.constant.type = IS_LONG;
+                       retval_znode.u.constant.value.lval = 1;
+                       do_return(&retval_znode, 0 CLS_CC);
                        CG(active_op_array) = original_active_op_array;
                        pass_two(op_array);
                        if (mark_as_ref) {