From 2f6cd308f9a8c53e0ce359603f4746b27bc32356 Mon Sep 17 00:00:00 2001
From: Andi Gutmans <andi@php.net>
Date: Wed, 8 Aug 2001 15:06:08 +0000
Subject: [PATCH] - Merge zend_try fix from Engine 1

---
 Zend/zend.c | 1 -
 Zend/zend.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zend/zend.c b/Zend/zend.c
index be0901c540..c732db54db 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -539,7 +539,6 @@ ZEND_API char *get_zend_version()
 
 void zend_activate(TSRMLS_D)
 {
-	EG(bailout_set) = 0;
 	init_compiler(TSRMLS_C);
 	init_executor(TSRMLS_C);
 	startup_scanner(TSRMLS_C);
diff --git a/Zend/zend.h b/Zend/zend.h
index 090ae3c829..5d808bfd20 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -356,6 +356,7 @@ END_EXTERN_C()
 		memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf));	\
 		EG(bailout_set) = orig_bailout_set;						\
 	}
+#define zend_first_try		EG(bailout_set)=0;	zend_try
 
 ZEND_API char *get_zend_version(void);
 ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
-- 
2.50.1