cvs: php-src(PHP_5_2) /main/streams plain_wrapper.c

tony2001 Mon Jun 5 22:39:50 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main/streams plain_wrapper.c Log: MFH: no need to check if non-existing include_path complies with open_basedir setting http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.2&r2=1.52.2.6.2.3&diff_format=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.2 php-src/main/streams/plain_wrapper.c:1.52.2.6.2.3 --- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.2 Mon Jun 5 22:19:36 2006 +++ php-src/main/streams/plain_wrapper.c Mon Jun 5 22:39:50 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: plain_wrapper.c,v 1.52.2.6.2.2 2006/06/05 22:19:36 edink Exp $ */ +/* $Id: plain_wrapper.c,v 1.52.2.6.2.3 2006/06/05 22:39:50 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -1272,11 +1272,6 @@ #endif if (!path || (path && !*path)) { - - if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { - return NULL; - } - if (PG(safe_mode) && (!php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) { return NULL; }