- Cleanup

diff --git a/main/streams/streams.c b/main/streams/streams.c
index db102f52d779a3ed76d8d12457941db8842ef0e6..45df9f0c18917d5ab7cd797be775389f3deb6827 100755 (executable)
--- 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 8a97661edb5bf044c5e9e299029b65e833bdf756..eeeb7140c7ed27d096dc77579cc3a26fdee7f2c5 100644 (file)
--- 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)
 {