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 803704fab471cda57822bc6aa1ff8566ddf5b4fc..699b48dcdf3cda98f9d3e41de6b972c8a25509d0 100644 (file)
--- 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 38bd1e323bd92caf7d96acd611b954afb8d1216e..40058180d2a45a63a28a1597078bd2901751ac47 100644 (file)
--- 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 d8f87f63924687d6b6af96deb6cce22bf6a73d14..b005c2a6c0901c6b3fedbca5b9c397eee9efea8c 100644 (file)
--- 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;