helly Sat Mar 3 19:01:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams streams.c
Log:
- MFH A stream wrapper might only allow directory access
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.11&r2=1.82.2.6.2.12&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.11
php-src/main/streams/streams.c:1.82.2.6.2.12
--- php-src/main/streams/streams.c:1.82.2.6.2.11 Wed Feb 21 21:57:21 2007
+++ php-src/main/streams/streams.c Sat Mar 3 19:01:34 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.11 2007/02/21 21:57:21 tony2001 Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.12 2007/03/03 19:01:34 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1769,10 +1769,14 @@
}
if (wrapper) {
-
- stream = wrapper->wops->stream_opener(wrapper,
+ if (!wrapper->wops->stream_opener) {
+ php_stream_wrapper_log_error(wrapper, options ^
REPORT_ERRORS TSRMLS_CC,
+ "wrapper does not support stream open");
+ } else {
+ stream = wrapper->wops->stream_opener(wrapper,
path_to_open, mode, options ^ REPORT_ERRORS,
opened_path, context STREAMS_REL_CC TSRMLS_CC);
+ }
/* if the caller asked for a persistent stream but the wrapper
did not
* return one, force an error here */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
