diff options
| -rw-r--r-- | ext/standard/basic_functions.c | 8 | ||||
| -rw-r--r-- | main/main.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 3681253e02..acf12a1430 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1133,10 +1133,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) PHP_RINIT_FUNCTION(basic) { -#ifdef PHP_WIN32 - CoInitialize(NULL); -#endif - memset(BG(strtok_table), 0, 256); BG(strtok_string) = NULL; BG(strtok_zval) = NULL; @@ -1229,10 +1225,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) } #endif -#ifdef PHP_WIN32 - CoUninitialize(); -#endif - return SUCCESS; } diff --git a/main/main.c b/main/main.c index f6e6396506..5015d47861 100644 --- a/main/main.c +++ b/main/main.c @@ -873,6 +873,10 @@ int php_request_startup(TSRMLS_D) { int retval = SUCCESS; +#ifdef PHP_WIN32 + CoInitialize(NULL); +#endif + #if PHP_SIGCHILD signal(SIGCHLD, sigchld_handler); #endif @@ -1072,6 +1076,10 @@ void php_request_shutdown(void *dummy) zend_try { zend_unset_timeout(TSRMLS_C); } zend_end_try(); + +#ifdef PHP_WIN32 + CoUninitialize(); +#endif } /* }}} */ |