summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2002-04-16 22:14:27 +0000
committerWez Furlong <wez@php.net>2002-04-16 22:14:27 +0000
commitb10b24d50cd4fb584897badee0c6b809b02d7fcb (patch)
tree7f616a36aab17efb68f83ec3075b454eb4b34356 /main/php.h
parentfe2badf64eb32c290e681dd531a27c5467b0867b (diff)
downloadphp-git-b10b24d50cd4fb584897badee0c6b809b02d7fcb.tar.gz
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
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h9
1 files changed, 5 insertions, 4 deletions
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)