andi Sun Feb 19 03:41:25 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
- Fix according to Sara's reply
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.61&r2=1.62&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.61
php-src/main/streams/plain_wrapper.c:1.62
--- php-src/main/streams/plain_wrapper.c:1.61 Sun Feb 19 01:19:37 2006
+++ php-src/main/streams/plain_wrapper.c Sun Feb 19 03:41:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.61 2006/02/19 01:19:37 andi Exp $ */
+/* $Id: plain_wrapper.c,v 1.62 2006/02/19 03:41:25 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -963,9 +963,8 @@
if ((p = strstr(url, "://")) != NULL) {
url = p + 3;
}
-
- /* FIXME: Andi - Pending email I sent to internals@ re:
ENFORCE_SAFE_MODE */
- if (options & ENFORCE_SAFE_MODE) {
+
+ if (!(options & STREAM_DISABLE_OPEN_BASEDIR)) {
if (php_check_open_basedir(url TSRMLS_CC)) {
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
