cvs: php-src /main/streams plain_wrapper.c

cellog Sun Apr 13 22:19:23 2008 UTC Modified files: /php-src/main/streams plain_wrapper.c Log: MFB do not scan include_path with faulty plain_wrapper-based include_path fopen # _fopen_with_path_rel probably needs to call out to regular php_stream_open, for exts that use it (it is exported) http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.94&r2=1.95&diff_format=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.94 php-src/main/streams/plain_wrapper.c:1.95 --- php-src/main/streams/plain_wrapper.c:1.94 Thu Mar 27 10:33:52 2008 +++ php-src/main/streams/plain_wrapper.c Sun Apr 13 22:19:23 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: plain_wrapper.c,v 1.94 2008/03/27 10:33:52 dmitry Exp $ */ +/* $Id: plain_wrapper.c,v 1.95 2008/04/13 22:19:23 cellog Exp $ */ #include "php.h" #include "php_globals.h" @@ -976,10 +976,6 @@ static php_stream *php_plain_files_stream_opener(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC) { - if ((options & USE_PATH) && PG(include_path) != NULL) { - return php_stream_fopen_with_path_rel(path, mode, PG(include_path), opened_path, options); - } - if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; }