cvs: php4 /ext/standard file.c
| From: | Rasmus Lerdorf | Date: | Sun, 12 May 2002 15:59:42 +0000 |
| Subject: | cvs: php4 /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11873@lists.php.net to get a copy of this message | ||
rasmus Sun May 12 11:59:42 2002 EDT
Modified files:
/php4/ext/standard file.c
Log:
Change safe-mode rule for rmdir() to match unlink() - allow is target
is opened by caller or in a directory owned by caller
@ Minor fix to rmdir() under safe-mode (Rasmus)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.228 php4/ext/standard/file.c:1.229
--- php4/ext/standard/file.c:1.228 Mon May 6 13:31:22 2002
+++ php4/ext/standard/file.c Sun May 12 11:59:42 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.228 2002/05/06 17:31:22 jimw Exp $ */
+/* $Id: file.c,v 1.229 2002/05/12 15:59:42 rasmus Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1533,7 +1533,7 @@
convert_to_string_ex(arg1);
- if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(arg1), NULL,
CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
+ if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(arg1), NULL, CHECKUID_CHECK_FILE_AND_DIR)))
{
RETURN_FALSE;
}