cvs: ZendEngine2 / zend_execute_API.c zend_globals.h

hyanantha Wed Sep 22 11:51:56 2004 EDT Modified files: /ZendEngine2 zend_globals.h zend_execute_API.c Log: NetWare specific stack limit checks http://cvs.php.net/diff.php/ZendEngine2/zend_globals.h?r1=1.137&r2=1.138&ty=u Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.137 ZendEngine2/zend_globals.h:1.138 --- ZendEngine2/zend_globals.h:1.137 Mon Aug 23 16:57:40 2004 +++ ZendEngine2/zend_globals.h Wed Sep 22 11:51:56 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_globals.h,v 1.137 2004/08/23 20:57:40 helly Exp $ */ +/* $Id: zend_globals.h,v 1.138 2004/09/22 15:51:56 hyanantha Exp $ */ #ifndef ZEND_GLOBALS_H #define ZEND_GLOBALS_H @@ -202,6 +202,10 @@ #ifdef ZEND_WIN32 zend_bool timed_out; +#endif + +#ifdef NETWARE + zend_bool nw_stack_limit; #endif HashTable regular_list; http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.296&r2=1.297&ty=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.296 ZendEngine2/zend_execute_API.c:1.297 --- ZendEngine2/zend_execute_API.c:1.296 Fri Sep 17 06:13:52 2004 +++ ZendEngine2/zend_execute_API.c Wed Sep 22 11:51:56 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.296 2004/09/17 10:13:52 stas Exp $ */ +/* $Id: zend_execute_API.c,v 1.297 2004/09/22 15:51:56 hyanantha Exp $ */ #include <stdio.h> #include <signal.h> @@ -49,6 +49,9 @@ 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); @@ -178,6 +181,10 @@ EG(timed_out) = 0; #endif +#ifdef NETWARE + EG(nw_stack_limit) = 0; +#endif + EG(exception) = NULL; EG(scope) = NULL; @@ -1104,6 +1111,12 @@ 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)