[PHP-CVS] cvs: php-src /ext/standard dir.c /ext/standard/tests/file chroot_001.phpt

[Arnaud Le Blanc]

lbarnaud                Mon Aug 11 23:14:21 2008 UTC

  Added files:                 
    /php-src/ext/standard/tests/file    chroot_001.phpt 

  Modified files:              
    /php-src/ext/standard       dir.c 
  Log:
  clear stat cache in chroot()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.179&r2=1.180&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.179 php-src/ext/standard/dir.c:1.180
--- php-src/ext/standard/dir.c:1.179    Mon Aug 11 22:38:17 2008
+++ php-src/ext/standard/dir.c  Mon Aug 11 23:14:21 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.179 2008/08/11 22:38:17 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.180 2008/08/11 23:14:21 lbarnaud Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -320,7 +320,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 ([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