cvs: php4 /ext/standard basic_functions.c ftp_fopen_wrapper.c http_fopen_wrapper.c /main fopen-wrappers.c /win32 php4dllts.dsp

dbeu Fri Oct 13 02:13:01 2000 EDT Modified files: /php4/ext/standard basic_functions.c ftp_fopen_wrapper.c http_fopen_wrapper.c /php4/main fopen-wrappers.c /php4/win32 php4dllts.dsp Log: compile fixes & update of win32 dsp Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.263 php4/ext/standard/basic_functions.c:1.264 --- php4/ext/standard/basic_functions.c:1.263 Thu Oct 12 17:09:31 2000 +++ php4/ext/standard/basic_functions.c Fri Oct 13 02:13:00 2000 @@ -17,10 +17,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.263 2000/10/13 00:09:31 hholzgra Exp $ */ +/* $Id: basic_functions.c,v 1.264 2000/10/13 09:13:00 dbeu Exp $ */ #include "php.h" #include "php_main.h" +#include "php_globals.h" #include "php_ini.h" #include "internal_functions_registry.h" #include "php_standard.h" @@ -736,6 +737,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) { + PLS_FETCH(); BLS_FETCH(); basic_globals_dtor(BLS_C); Index: php4/ext/standard/ftp_fopen_wrapper.c diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.1 php4/ext/standard/ftp_fopen_wrapper.c:1.2 --- php4/ext/standard/ftp_fopen_wrapper.c:1.1 Thu Oct 12 17:09:31 2000 +++ php4/ext/standard/ftp_fopen_wrapper.c Fri Oct 13 02:13:00 2000 @@ -17,10 +17,11 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.1 2000/10/13 00:09:31 hholzgra Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.2 2000/10/13 09:13:00 dbeu Exp $ */ #include "php.h" #include "php_globals.h" +#include "php_network.h" #include <stdio.h> #include <stdlib.h> Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.1 php4/ext/standard/http_fopen_wrapper.c:1.2 --- php4/ext/standard/http_fopen_wrapper.c:1.1 Thu Oct 12 17:09:31 2000 +++ php4/ext/standard/http_fopen_wrapper.c Fri Oct 13 02:13:00 2000 @@ -17,10 +17,11 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.1 2000/10/13 00:09:31 hholzgra Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.2 2000/10/13 09:13:00 dbeu Exp $ */ #include "php.h" #include "php_globals.h" +#include "php_network.h" #include <stdio.h> #include <stdlib.h> Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.96 php4/main/fopen-wrappers.c:1.97 --- php4/main/fopen-wrappers.c:1.96 Thu Oct 12 17:09:31 2000 +++ php4/main/fopen-wrappers.c Fri Oct 13 02:13:01 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.96 2000/10/13 00:09:31 hholzgra Exp $ */ +/* $Id: fopen-wrappers.c,v 1.97 2000/10/13 09:13:01 dbeu Exp $ */ #include "php.h" #include "php_globals.h" @@ -110,6 +110,8 @@ int php_init_fopen_wrappers(void) { + PLS_FETCH(); + int status = SUCCESS; if(PG(allow_url_fopen)) { @@ -123,6 +125,8 @@ int php_shutdown_fopen_wrappers(void) { + PLS_FETCH(); + if(PG(allow_url_fopen)) { zend_hash_destroy(&fopen_url_wrappers_hash); } Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.18 php4/win32/php4dllts.dsp:1.19 --- php4/win32/php4dllts.dsp:1.18 Thu Oct 5 17:03:02 2000 +++ php4/win32/php4dllts.dsp Fri Oct 13 02:13:01 2000 @@ -377,6 +377,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\ftp_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\head.c # End Source File # Begin Source File @@ -385,6 +389,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\http_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\image.c # End Source File # Begin Source File @@ -461,6 +469,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\php_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\mcal\php_mcal.c # End Source File # Begin Source File @@ -619,6 +631,10 @@ # Begin Source File SOURCE=..\ext\standard\php_filestat.h +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\php_fopen_wrappers.h # End Source File # Begin Source File