jani Wed Oct 31 13:22:18 2007 UTC Added files: /php-src/ext/standard/tests/file bug43137.phpt
Modified files: /php-src/ext/standard filestat.c php_filestat.h /php-src/ext/standard/tests/file 005_basic.phpt 005_error.phpt /php-src/main/streams plain_wrapper.c Log: - Fixed bug #43137 (rmdir() and rename() do not clear statcache) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.164&r2=1.165&diff_format=u Index: php-src/ext/standard/filestat.c diff -u php-src/ext/standard/filestat.c:1.164 php-src/ext/standard/filestat.c:1.165 --- php-src/ext/standard/filestat.c:1.164 Fri Sep 21 14:05:01 2007 +++ php-src/ext/standard/filestat.c Wed Oct 31 13:22:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.164 2007/09/21 14:05:01 tony2001 Exp $ */ +/* $Id: filestat.c,v 1.165 2007/10/31 13:22:18 jani Exp $ */ #include "php.h" #include "fopen_wrappers.h" @@ -751,14 +751,10 @@ /* }}} */ #endif -/* {{{ proto void clearstatcache(void) U - Clear file stat cache */ -PHP_FUNCTION(clearstatcache) +/* {{{ php_clear_stat_cache() +*/ +PHPAPI void php_clear_stat_cache(TSRMLS_D) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; - } - if (BG(CurrentStatFile)) { efree(BG(CurrentStatFile)); BG(CurrentStatFile) = NULL; @@ -771,6 +767,17 @@ } /* }}} */ +/* {{{ proto void clearstatcache(void) + Clear file stat cache */ +PHP_FUNCTION(clearstatcache) +{ + if (ZEND_NUM_ARGS()) { + WRONG_PARAM_COUNT; + } + php_clear_stat_cache(TSRMLS_C); +} +/* }}} */ + #define IS_LINK_OPERATION(__t) ((__t) == FS_TYPE || (__t) == FS_IS_LINK || (__t) == FS_LSTAT) #define IS_EXISTS_CHECK(__t) ((__t) == FS_EXISTS || (__t) == FS_IS_W || (__t) == FS_IS_R || (__t) == FS_IS_X || (__t) == FS_IS_FILE || (__t) == FS_IS_DIR || (__t) == FS_IS_LINK) #define IS_ABLE_CHECK(__t) ((__t) == FS_IS_R || (__t) == FS_IS_W || (__t) == FS_IS_X) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_filestat.h?r1=1.31&r2=1.32&diff_format=u Index: php-src/ext/standard/php_filestat.h diff -u php-src/ext/standard/php_filestat.h:1.31 php-src/ext/standard/php_filestat.h:1.32 --- php-src/ext/standard/php_filestat.h:1.31 Sun Oct 7 05:15:06 2007 +++ php-src/ext/standard/php_filestat.h Wed Oct 31 13:22:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_filestat.h,v 1.31 2007/10/07 05:15:06 davidw Exp $ */ +/* $Id: php_filestat.h,v 1.32 2007/10/31 13:22:18 jani Exp $ */ #ifndef PHP_FILESTAT_H #define PHP_FILESTAT_H @@ -87,6 +87,7 @@ typedef int php_stat_len; #endif +PHPAPI void php_clear_stat_cache(TSRMLS_D); PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, zval *return_value TSRMLS_DC); PHPAPI void php_u_stat(zend_uchar filename_type, const zstr filename, php_stat_len filename_length, int type, php_stream_context *context, zval *return_value TSRMLS_DC); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/005_basic.phpt diff -u php-src/ext/standard/tests/file/005_basic.phpt:1.2 php-src/ext/standard/tests/file/005_basic.phpt:1.3 --- php-src/ext/standard/tests/file/005_basic.phpt:1.2 Mon Jun 11 16:40:27 2007 +++ php-src/ext/standard/tests/file/005_basic.phpt Wed Oct 31 13:22:18 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions: basic functionality +Test fileatime(), filemtime(), filectime() & touch() functions : basic functionality --FILE-- <?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/005_error.phpt diff -u php-src/ext/standard/tests/file/005_error.phpt:1.2 php-src/ext/standard/tests/file/005_error.phpt:1.3 --- php-src/ext/standard/tests/file/005_error.phpt:1.2 Mon Jun 11 16:40:27 2007 +++ php-src/ext/standard/tests/file/005_error.phpt Wed Oct 31 13:22:18 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions: error conditions +Test fileatime(), filemtime(), filectime() & touch() functions : error conditions --FILE-- <?php /* http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.90&r2=1.91&diff_format=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.90 php-src/main/streams/plain_wrapper.c:1.91 --- php-src/main/streams/plain_wrapper.c:1.90 Wed Jul 25 16:34:27 2007 +++ php-src/main/streams/plain_wrapper.c Wed Oct 31 13:22:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: plain_wrapper.c,v 1.90 2007/07/25 16:34:27 dmitry Exp $ */ +/* $Id: plain_wrapper.c,v 1.91 2007/10/31 13:22:18 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -24,6 +24,7 @@ #include "php_open_temporary_file.h" #include "ext/standard/file.h" #include "ext/standard/flock_compat.h" +#include "ext/standard/php_filestat.h" #include <stddef.h> #include <fcntl.h> #if HAVE_SYS_WAIT_H @@ -1025,13 +1026,10 @@ } return 0; } + /* Clear stat cache */ - ZVAL_ASCII_STRINGL(&funcname, "clearstatcache", sizeof("clearstatcache")-1, 1); - call_user_function_ex(CG(function_table), NULL, &funcname, &retval, 0, NULL, 0, NULL TSRMLS_CC); - zval_dtor(&funcname); - if (retval) { - zval_ptr_dtor(&retval); - } + php_clear_stat_cache(TSRMLS_C); + return 1; } @@ -1096,6 +1094,9 @@ return 0; } + /* Clear stat cache */ + php_clear_stat_cache(TSRMLS_C); + return 1; } @@ -1203,6 +1204,9 @@ return 0; } + /* Clear stat cache */ + php_clear_stat_cache(TSRMLS_C); + return 1; } @@ -1359,9 +1363,6 @@ } /* }}} */ - - - /* * Local variables: * tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43137.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/bug43137.phpt +++ php-src/ext/standard/tests/file/bug43137.phpt --TEST-- Bug #43137 (rmdir() and rename() do not clear statcache) --FILE-- <?php $toname = "TO_" . md5(microtime()); $dirname = "FROM_" . md5(microtime()); mkdir($dirname); var_dump(is_dir($dirname)); // Expected: true rename($dirname, $toname); var_dump(is_dir($dirname)); // Expected: false var_dump(is_dir($toname)); // Expected: true rmdir($toname); var_dump(is_dir($toname)); // Expected: false ?> --EXPECT-- bool(true) bool(false) bool(true) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php