- Move timeout code to Zend

- Implement timeouts in Win32

1 files changed, 10 insertions, 0 deletions

diff --git a/Zend/zend.c b/Zend/zend.c
index b0a070d694..7a056d7bfa 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -292,6 +292,9 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals)
 	}
 	zend_init_rsrc_plist(ELS_C);
 	EG(lambda_count)=0;
+#ifdef ZEND_WIN32
+	zend_create_timeout_window(ELS_C);
+#endif
 }
 
 
@@ -299,6 +302,9 @@ static void executor_globals_dtor(zend_executor_globals *executor_globals)
 {
 	zend_shutdown_constants(ELS_C);
 	zend_destroy_rsrc_plist(ELS_C);
+#ifdef ZEND_WIN32
+	zend_destroy_timeout_window(ELS_C);
+#endif
 }
 
 
@@ -366,6 +372,10 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 	zval_used_for_init.refcount = 1;
 	zval_used_for_init.type = IS_NULL;
 
+#ifdef ZEND_WIN32
+	zend_register_timeout_wndclass();
+#endif
+
 #ifdef ZTS
 	global_constants_table = NULL;
 	compiler_globals_id = ts_allocate_id(sizeof(zend_compiler_globals), (void (*)(void *)) compiler_globals_ctor, (void (*)(void *)) compiler_globals_dtor);