cvs: php-src(PHP_5_3) /ext/standard dir.c /ext/standard/tests/file chroot_001.phpt
| From: | Arnaud Le Blanc | Date: | Mon, 11 Aug 2008 23:14:36 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/standard dir.c /ext/standard/tests/file chroot_001.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52248@lists.php.net to get a copy of this message | ||
lbarnaud Mon Aug 11 23:14:36 2008 UTC
Added files: (Branch: PHP_5_3)
/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.12.2.10&r2=1.147.2.3.2.12.2.11&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.10
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.10 Mon Aug 11 22:38:31 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 23:14:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.10 2008/08/11 22:38:31 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.11 2008/08/11 23:14:36 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -296,7 +296,7 @@
RETURN_FALSE;
}
- realpath_cache_clean(TSRMLS_C);
+ php_clear_stat_cache(1, NULL, 0 TSRMLS_CC);
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 (!@mkdir("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) "/"