diff options
| author | Marcus Boerger <helly@php.net> | 2006-02-28 12:06:54 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-02-28 12:06:54 +0000 |
| commit | 6531669e4efb2a30d3600ac7ebb0789579a3530c (patch) | |
| tree | 9d0d32e305e2c6b3086ffd88e6f6593ce09b3322 | |
| parent | 232eace5c8c9a421475311cf004a64df4720caa9 (diff) | |
| download | php-git-6531669e4efb2a30d3600ac7ebb0789579a3530c.tar.gz | |
- Cleanup
| -rwxr-xr-x | main/streams/streams.c | 2 | ||||
| -rw-r--r-- | main/streams/userspace.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index db102f52d7..45df9f0c18 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2205,7 +2205,7 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, char return &php_plain_files_wrapper; } - if ((wrapper && wrapper->is_url) && (!PG(allow_url_fopen) || (options & STREAM_OPEN_FOR_INCLUDE) && !PG(allow_url_include)) ) { + if ((wrapper && wrapper->is_url) && (!PG(allow_url_fopen) || ((options & STREAM_OPEN_FOR_INCLUDE) && !PG(allow_url_include))) ) { if (options & REPORT_ERRORS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL file-access is disabled in the server configuration"); } diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 8a97661edb..eeeb7140c7 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -437,7 +437,7 @@ PHP_FUNCTION(stream_wrapper_register) } /* }}} */ -/* {{{ bool stream_wrapper_unregister(string protocol) +/* {{{ proto bool stream_wrapper_unregister(string protocol) Unregister a wrapper for the life of the current request. */ PHP_FUNCTION(stream_wrapper_unregister) { @@ -458,7 +458,7 @@ PHP_FUNCTION(stream_wrapper_unregister) } /* }}} */ -/* {{{ bool stream_wrapper_restore(string protocol) +/* {{{ proto bool stream_wrapper_restore(string protocol) Restore the original protocol handler, overriding if necessary */ PHP_FUNCTION(stream_wrapper_restore) { |