Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix grammo
This commit is contained in:
Rasmus Lerdorf 2012-05-13 11:48:25 -07:00
commit 8da61c62d9

View file

@ -803,7 +803,7 @@ PHP_FUNCTION(touch)
PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char *filename, int filename_len TSRMLS_DC)
{
/* always clear CurrentStatFile and CurrentLStatFile even if filename is not NULL
* as it may contains outdated data (e.g. "nlink" for a directory when deleting a file
* as it may contain outdated data (e.g. "nlink" for a directory when deleting a file
* in this directory, as shown by lstat_stat_variation9.phpt) */
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));