Browse Source

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

PHP-5.1
Anantha Kesari H Y 22 years ago
parent
commit
b04db9d9e0
  1. 5
      Zend/zend_execute.c
  2. 15
      Zend/zend_execute_API.c
  3. 4
      Zend/zend_globals.h

5
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;

15
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)
{

4
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;

Loading…
Cancel
Save