From b10b24d50cd4fb584897badee0c6b809b02d7fcb Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Tue, 16 Apr 2002 22:14:27 +0000 Subject: Always initialize wrappers, regardless of PG(allow_url_fopen). Add is_url field to wrapper structure; the stream wrapper openers will disallow opening is is_url && !PG(allow_url_fopen). Add infrastructure for stat($url) and opendir($url). Tidy up/centralize code that locates and instantiates wrappers for the various operations. Implement opendir for plain files. Make the PHP opendir and dir functions use the streams implementations. Add modelines for syntax highlighting the pear scripts in vim --- main/php.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main/php.h') diff --git a/main/php.h b/main/php.h index 6784e06df9..026e5713e8 100644 --- a/main/php.h +++ b/main/php.h @@ -171,10 +171,6 @@ typedef unsigned int socklen_t; char *strerror(int); #endif -#include "php_streams.h" -#include "php_memory_streams.h" -#include "fopen_wrappers.h" - #if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H) #include "regex/regex_extra.h" #endif @@ -221,6 +217,11 @@ char *strerror(int); # endif #endif +#include "php_streams.h" +#include "php_memory_streams.h" +#include "fopen_wrappers.h" + + /* global variables */ extern pval *data; #if !defined(PHP_WIN32) -- cgit v1.2.1