mirror of
https://github.com/php/php-src.git
synced 2025-01-26 21:54:16 +08:00
now it works for me as CGI and APXS, with or without --enable-debug ...
This commit is contained in:
parent
afef79762d
commit
6d5f1d97f8
@ -746,6 +746,12 @@ PHP_MSHUTDOWN_FUNCTION(basic)
|
||||
ts_free_id(basic_globals_id);
|
||||
#endif
|
||||
|
||||
if(PG(allow_url_fopen)) {
|
||||
php_unregister_url_wrapper("http");
|
||||
php_unregister_url_wrapper("ftp");
|
||||
php_unregister_url_wrapper("php");
|
||||
}
|
||||
|
||||
UNREGISTER_INI_ENTRIES();
|
||||
|
||||
PHP_MSHUTDOWN(regex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
|
||||
@ -754,11 +760,6 @@ PHP_MSHUTDOWN_FUNCTION(basic)
|
||||
PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
|
||||
PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
|
||||
|
||||
if(PG(allow_url_fopen)) {
|
||||
php_unregister_url_wrapper("http");
|
||||
php_unregister_url_wrapper("ftp");
|
||||
php_unregister_url_wrapper("php");
|
||||
}
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
@ -110,9 +110,8 @@ PHPAPI int php_unregister_url_wrapper(char *protocol)
|
||||
|
||||
int php_init_fopen_wrappers(void)
|
||||
{
|
||||
PLS_FETCH();
|
||||
|
||||
int status = SUCCESS;
|
||||
PLS_FETCH();
|
||||
|
||||
if(PG(allow_url_fopen)) {
|
||||
if (zend_hash_init(&fopen_url_wrappers_hash, 0, NULL, NULL, 1)==FAILURE) {
|
||||
|
@ -916,8 +916,6 @@ void php_module_shutdown()
|
||||
return;
|
||||
}
|
||||
|
||||
php_shutdown_fopen_wrappers();
|
||||
|
||||
/* close down the ini config */
|
||||
php_config_ini_shutdown();
|
||||
|
||||
@ -931,6 +929,7 @@ void php_module_shutdown()
|
||||
|
||||
global_lock_destroy();
|
||||
zend_shutdown();
|
||||
php_shutdown_fopen_wrappers();
|
||||
UNREGISTER_INI_ENTRIES();
|
||||
php_ini_mshutdown();
|
||||
shutdown_memory_manager(0, 1);
|
||||
|
Loading…
Reference in New Issue
Block a user