iliaa Tue Mar 16 18:23:18 2004 EDT
Modified files:
/php-src/main/streams plain_wrapper.c
/php-src/ext/standard dir.c
Log:
Fixed bug #27498 (bogus safe_mode error on nonexistent directories for
chdir() and opendir() functions).
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.34&r2=1.35&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.34
php-src/main/streams/plain_wrapper.c:1.35
--- php-src/main/streams/plain_wrapper.c:1.34 Tue Jan 20 21:28:50 2004
+++ php-src/main/streams/plain_wrapper.c Tue Mar 16 18:23:16 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.34 2004/01/21 02:28:50 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.35 2004/03/16 23:23:16 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -856,7 +856,7 @@
return NULL;
}
- if (PG(safe_mode) &&(!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_FILE))) {
+ if (PG(safe_mode) &&(!php_checkuid(path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
return NULL;
}
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.135&r2=1.136&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.135 php-src/ext/standard/dir.c:1.136
--- php-src/ext/standard/dir.c:1.135 Mon Mar 1 00:40:14 2004
+++ php-src/ext/standard/dir.c Tue Mar 16 18:23:17 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.135 2004/03/01 05:40:14 pollita Exp $ */
+/* $Id: dir.c,v 1.136 2004/03/16 23:23:17 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -283,7 +283,7 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_ALLOW_ONLY_FILE)) {
+ if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
RETURN_FALSE;
}
ret = VCWD_CHDIR(str);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
