lbarnaud Mon Aug 11 23:16:41 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file chroot_001.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
MFH: clear stat cache in chroot()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.19&r2=1.147.2.3.2.20&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.19
php-src/ext/standard/dir.c:1.147.2.3.2.20
--- php-src/ext/standard/dir.c:1.147.2.3.2.19 Mon Aug 11 22:39:42 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 23:16:40 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.19 2008/08/11 22:39:42 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.20 2008/08/11 23:16:40 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -295,7 +295,7 @@
RETURN_FALSE;
}
- realpath_cache_clean(TSRMLS_C);
+ php_clear_stat_cache(TSRMLS_C);
ret = chdir("/");
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chroot_001.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/chroot_001.phpt
+++ php-src/ext/standard/tests/file/chroot_001.phpt
--TEST--
chroot()
--SKIPIF--
<?php
chdir("/");
if ([EMAIL PROTECTED]("testtmpskipifdir")) {
die("skip for root only");
}
rmdir("testtmpskipifdir");
if (!function_exists("chroot")) {
die("skip chroot() not available");
}
?>
--FILE--
<?php
mkdir("chroot_001_x");
var_dump(is_dir("chroot_001_x"));
var_dump(chroot("chroot_001_x"));
var_dump(is_dir("chroot_001_x"));
var_dump(realpath("."));
?>
--CLEAN--
<?php
rmdir("chroot_001_x");
?>
--EXPECTF--
bool(true)
bool(true)
bool(false)
%unicode|string%(1) "/"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
