mirror of
https://github.com/php/php-src.git
synced 2025-08-19 17:04:47 +02:00
MFPHP_4_3
This commit is contained in:
parent
e6170c0b30
commit
f8e014b228
2 changed files with 8 additions and 8 deletions
|
@ -1133,10 +1133,6 @@ PHP_MSHUTDOWN_FUNCTION(basic)
|
||||||
|
|
||||||
PHP_RINIT_FUNCTION(basic)
|
PHP_RINIT_FUNCTION(basic)
|
||||||
{
|
{
|
||||||
#ifdef PHP_WIN32
|
|
||||||
CoInitialize(NULL);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
memset(BG(strtok_table), 0, 256);
|
memset(BG(strtok_table), 0, 256);
|
||||||
BG(strtok_string) = NULL;
|
BG(strtok_string) = NULL;
|
||||||
BG(strtok_zval) = NULL;
|
BG(strtok_zval) = NULL;
|
||||||
|
@ -1229,10 +1225,6 @@ PHP_RSHUTDOWN_FUNCTION(basic)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PHP_WIN32
|
|
||||||
CoUninitialize();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return SUCCESS;
|
return SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -873,6 +873,10 @@ int php_request_startup(TSRMLS_D)
|
||||||
{
|
{
|
||||||
int retval = SUCCESS;
|
int retval = SUCCESS;
|
||||||
|
|
||||||
|
#ifdef PHP_WIN32
|
||||||
|
CoInitialize(NULL);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if PHP_SIGCHILD
|
#if PHP_SIGCHILD
|
||||||
signal(SIGCHLD, sigchld_handler);
|
signal(SIGCHLD, sigchld_handler);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1072,6 +1076,10 @@ void php_request_shutdown(void *dummy)
|
||||||
zend_try {
|
zend_try {
|
||||||
zend_unset_timeout(TSRMLS_C);
|
zend_unset_timeout(TSRMLS_C);
|
||||||
} zend_end_try();
|
} zend_end_try();
|
||||||
|
|
||||||
|
#ifdef PHP_WIN32
|
||||||
|
CoUninitialize();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue