helly Tue Feb 28 12:06:55 2006 UTC
Modified files:
/php-src/main/streams streams.c userspace.c
Log:
- Cleanup
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.96&r2=1.97&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.96 php-src/main/streams/streams.c:1.97
--- php-src/main/streams/streams.c:1.96 Tue Feb 21 20:12:43 2006
+++ php-src/main/streams/streams.c Tue Feb 28 12:06:54 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.96 2006/02/21 20:12:43 dmitry Exp $ */
+/* $Id: streams.c,v 1.97 2006/02/28 12:06:54 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2205,7 +2205,7 @@
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");
}
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/userspace.c?r1=1.32&r2=1.33&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.32
php-src/main/streams/userspace.c:1.33
--- php-src/main/streams/userspace.c:1.32 Sun Jan 1 13:09:57 2006
+++ php-src/main/streams/userspace.c Tue Feb 28 12:06:54 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.32 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: userspace.c,v 1.33 2006/02/28 12:06:54 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -437,7 +437,7 @@
}
/* }}} */
-/* {{{ 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 @@
}
/* }}} */
-/* {{{ 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)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
