now it works for me as CGI and APXS, with or without --enable-debug ...

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2e9e2f6155c38600fd2ec29e9ea9ce3c7f17bf51..bdf2fbb7cccb3d0a9eee65dd106301759b723764 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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; 
 }

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 974f0c47c7b54d2337eada64c6f398034ef272d5..716f3ba679d64b7ddbf1dbb5e502a5c895bb4908 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -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) {

diff --git a/main/main.c b/main/main.c
index f32789ba90debdf33ef15ca81186b0e98d230290..d2e18fcffdbbb4e85aa59522f834e3f075055398 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -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);