From: Daniel Beulshausen <dbeu@php.net>
Date: Fri, 13 Oct 2000 09:13:01 +0000 (+0000)
Subject: compile fixes & update of win32 dsp
X-Git-Tag: php-4.0.4RC3~695
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fb51171c884305125ece869fda5284b00933c3a;p=php

compile fixes & update of win32 dsp
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2459d06173..2e9e2f6155 100644
--- 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 f8f4f4413f..bdda60b67a 100644
--- 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 e22866649c..400695f2f1 100644
--- 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 4133f426a8..974f0c47c7 100644
--- 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 f8b09aac88..6d57671747 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -377,6 +377,10 @@ SOURCE=..\ext\standard\fsock.c
 # 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 @@ SOURCE=..\ext\standard\html.c
 # 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 @@ SOURCE=..\ext\standard\parsedate.c
 # 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
@@ -622,6 +634,10 @@ 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
+
 SOURCE=..\ext\standard\php_lcg.h
 # End Source File
 # Begin Source File