iliaa Tue Mar 16 18:23:27 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/main streams.c
/php-src/ext/standard dir.c
Log:
MFH: Fixed bug #27498 (bogus safe_mode error on nonexistent directories for
chdir() and opendir() functions).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.601&r2=1.1247.2.602&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.601 php-src/NEWS:1.1247.2.602
--- php-src/NEWS:1.1247.2.601 Tue Mar 16 17:38:16 2004
+++ php-src/NEWS Tue Mar 16 18:23:25 2004
@@ -20,6 +20,8 @@
- Fixed bug #27509 (broken getaddrinfo() causes fsockopen() error). (Sara)
- Fixed bug #27505 (htmlentities() does not handle BIG5 correctly). (Ilia,
ywliu at hotmail dot com)
+- Fixed bug #27498 (bogus safe_mode error on nonexistent directories for
+ chdir() and opendir() functions). (Ilia)
- Fixed bug #27460 (base64_decode() does not handle extra padding).
(Ilia, naish at klanen dot net)
- Fixed bug #27443 (defined() returns wrong type). (Derick)
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.86&r2=1.125.2.87&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.86 php-src/main/streams.c:1.125.2.87
--- php-src/main/streams.c:1.125.2.86 Sat Nov 29 07:02:40 2003
+++ php-src/main/streams.c Tue Mar 16 18:23:25 2004
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.86 2003/11/29 12:02:40 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.87 2004/03/16 23:23:25 iliaa Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2395,7 +2395,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.109.2.13&r2=1.109.2.14&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.13 php-src/ext/standard/dir.c:1.109.2.14
--- php-src/ext/standard/dir.c:1.109.2.13 Wed Oct 29 16:51:22 2003
+++ php-src/ext/standard/dir.c Tue Mar 16 18:23:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.109.2.13 2003/10/29 21:51:22 moriyoshi Exp $ */
+/* $Id: dir.c,v 1.109.2.14 2004/03/16 23:23:26 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -275,7 +275,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
