compile fixes & update of win32 dsp

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2459d0617304d1c35b020c0e120715b8d337c7a7..2e9e2f6155c38600fd2ec29e9ea9ce3c7f17bf51 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -21,6 +21,7 @@
 
 #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_MINIT_FUNCTION(basic)
 
 PHP_MSHUTDOWN_FUNCTION(basic)
 {
+       PLS_FETCH();
        BLS_FETCH();
 
        basic_globals_dtor(BLS_C);

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index f8f4f4413fbbf9b822f944ad5e4a7d22191a36c5..bdda60b67a21b2ec6ce83c3c2cde6e71fb47c741 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -21,6 +21,7 @@
 
 #include "php.h"
 #include "php_globals.h"
+#include "php_network.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index e22866649cc0ebd6e4e89b33a55f0157ce77f2f3..400695f2f1da58c23bd5ede4675427872d272aca 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -21,6 +21,7 @@
 
 #include "php.h"
 #include "php_globals.h"
+#include "php_network.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 4133f426a85e2cc59148e04e41192a64ac3568c7..974f0c47c7b54d2337eada64c6f398034ef272d5 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -110,6 +110,8 @@ PHPAPI int php_unregister_url_wrapper(char *protocol)
 
 int php_init_fopen_wrappers(void) 
 {
+       PLS_FETCH();
+
        int status = SUCCESS;
 
        if(PG(allow_url_fopen)) {
@@ -123,6 +125,8 @@ int php_init_fopen_wrappers(void)
 
 int php_shutdown_fopen_wrappers(void) 
 {
+       PLS_FETCH();
+
        if(PG(allow_url_fopen)) {
                zend_hash_destroy(&fopen_url_wrappers_hash);
        }

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index f8b09aac8884dc021658604c1fe258eabfddcb9a..6d576717478ac4ba86b327d5b325a7329d51212a 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -377,6 +377,10 @@ SOURCE=..\ext\standard\fsock.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\ftp_fopen_wrapper.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\standard\head.c\r
 # End Source File\r
 # Begin Source File\r
@@ -385,6 +389,10 @@ SOURCE=..\ext\standard\html.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\http_fopen_wrapper.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\standard\image.c\r
 # End Source File\r
 # Begin Source File\r
@@ -461,6 +469,10 @@ SOURCE=..\ext\standard\parsedate.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\php_fopen_wrapper.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\mcal\php_mcal.c\r
 # End Source File\r
 # Begin Source File\r
@@ -622,6 +634,10 @@ SOURCE=..\ext\standard\php_filestat.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\php_fopen_wrappers.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\standard\php_lcg.h\r
 # End Source File\r
 # Begin Source File\r