cvs: php4 /ext/standard basic_functions.c /main fopen-wrappers.c main.c

hholzgra Fri Oct 13 03:04:18 2000 EDT Modified files: /php4/main main.c fopen-wrappers.c /php4/ext/standard basic_functions.c Log: now it works for me as CGI and APXS, with or without --enable-debug ... Index: php4/main/main.c diff -u php4/main/main.c:1.323 php4/main/main.c:1.324 --- php4/main/main.c:1.323 Thu Oct 12 17:09:31 2000 +++ php4/main/main.c Fri Oct 13 03:04:17 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.323 2000/10/13 00:09:31 hholzgra Exp $ */ +/* $Id: main.c,v 1.324 2000/10/13 10:04:17 hholzgra Exp $ */ #include <stdio.h> @@ -916,8 +916,6 @@ return; } - php_shutdown_fopen_wrappers(); - /* close down the ini config */ php_config_ini_shutdown(); @@ -931,6 +929,7 @@ global_lock_destroy(); zend_shutdown(); + php_shutdown_fopen_wrappers(); UNREGISTER_INI_ENTRIES(); php_ini_mshutdown(); shutdown_memory_manager(0, 1); Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.97 php4/main/fopen-wrappers.c:1.98 --- php4/main/fopen-wrappers.c:1.97 Fri Oct 13 02:13:01 2000 +++ php4/main/fopen-wrappers.c Fri Oct 13 03:04:17 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.97 2000/10/13 09:13:01 dbeu Exp $ */ +/* $Id: fopen-wrappers.c,v 1.98 2000/10/13 10:04:17 hholzgra Exp $ */ #include "php.h" #include "php_globals.h" @@ -110,9 +110,8 @@ 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) { Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.264 php4/ext/standard/basic_functions.c:1.265 --- php4/ext/standard/basic_functions.c:1.264 Fri Oct 13 02:13:00 2000 +++ php4/ext/standard/basic_functions.c Fri Oct 13 03:04:17 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.264 2000/10/13 09:13:00 dbeu Exp $ */ +/* $Id: basic_functions.c,v 1.265 2000/10/13 10:04:17 hholzgra Exp $ */ #include "php.h" #include "php_main.h" @@ -746,6 +746,12 @@ 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(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; }