From 1e63f440843ee4520bd50b3275a79251caed0e7b Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Sun, 6 May 2001 14:36:25 +0000
Subject: [PATCH] Support interactive mode in thread-safe builds

---
 Zend/zend_compile.h          | 6 +-----
 Zend/zend_language_parser.y  | 4 ++--
 Zend/zend_language_scanner.l | 4 ++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index c8f5aaa981..0328a4d49d 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -35,11 +35,7 @@
 
 #define DEBUG_ZEND 0
 
-#ifndef ZTS
-# define SUPPORT_INTERACTIVE 1
-#else
-# define SUPPORT_INTERACTIVE 0
-#endif
+#define SUPPORT_INTERACTIVE 1
 
 #define FREE_PNODE(znode)	zval_dtor(&znode->u.constant);
 #define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 528c09e765..b1ddec2f12 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -139,7 +139,7 @@ start:
 ;
 
 top_statement_list:	
-		top_statement_list  { zend_do_extended_info(CLS_C); } top_statement { HANDLE_INTERACTIVE(); }
+		top_statement_list  { zend_do_extended_info(CLS_C); } top_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
 	|	/* empty */
 ;
 
@@ -151,7 +151,7 @@ top_statement:
 
 
 inner_statement_list:
-		inner_statement_list  { zend_do_extended_info(CLS_C); } inner_statement { HANDLE_INTERACTIVE(); }
+		inner_statement_list  { zend_do_extended_info(CLS_C); } inner_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
 	|	/* empty */
 ;
 
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 5e5ecb0d4f..82aa8b9a03 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -78,6 +78,10 @@
 #define YY_DECL int lex_scan(zval *zendlval CLS_DC)
 #endif
 
+#if SUPPORT_INTERACTIVE
+#define YY_INTERACTIVE
+#endif
+
 #define ECHO { ZEND_WRITE( yytext, yyleng ); }
 
 #ifdef ZTS
-- 
2.50.1