From: Anantha Kesari H Y <hyanantha@php.net>
Date: Thu, 23 Sep 2004 06:23:36 +0000 (+0000)
Subject: Reverted the NetWare Specific Stack limit related patches as asked by Andi
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b04db9d9e094594142bc6a3805cdb1e5df47ff4f;p=php

Reverted the NetWare Specific Stack limit related patches as asked by Andi
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 803704fab4..699b48dcdf 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1485,11 +1485,6 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
 		if (EG(timed_out)) {
 			zend_timeout(0);
 		}
-#endif
-#ifdef NETWARE
-		if (EG(nw_stack_limit) || (stackavail() <= 2048)) {
-			zend_nw_stack_limit(0);
-		}
 #endif
 		if (EX(opline)->handler(&execute_data TSRMLS_CC)) {
 			return;
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 38bd1e323b..40058180d2 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -49,10 +49,6 @@ static DWORD timeout_thread_id;
 static int timeout_thread_initialized=0;
 #endif
 
-#ifdef NETWARE
-ZEND_API void zend_nw_stack_limit(int dummy);
-#endif
-
 #if ZEND_DEBUG
 static void (*original_sigsegv_handler)(int);
 static void zend_handle_sigsegv(int dummy)
@@ -181,10 +177,6 @@ void init_executor(TSRMLS_D)
 	EG(timed_out) = 0;
 #endif
 
-#ifdef NETWARE
-	EG(nw_stack_limit) = 0;
-#endif
-
 	EG(exception) = NULL;
 
 	EG(scope) = NULL;
@@ -1111,13 +1103,6 @@ ZEND_API void zend_timeout(int dummy)
 			  EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
 }
 
-#ifdef NETWARE
-ZEND_API void zend_nw_stack_limit(int dummy)
-{
-    zend_error(E_ERROR, "Stack limit exceeded");
-}
-#endif
-
 #ifdef ZEND_WIN32
 static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index d8f87f6392..b005c2a6c0 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -204,10 +204,6 @@ struct _zend_executor_globals {
 	zend_bool timed_out;
 #endif
 
-#ifdef NETWARE
-       zend_bool nw_stack_limit;
-#endif
-
 	HashTable regular_list;
 	HashTable persistent_list;