Reduce number of stat() calls

Author: dstogov

Diff for: ext/spl/spl_directory.c

@@ -1474,13 +1474,15 @@ PHP_METHOD(RecursiveDirectoryIterator, hasChildren)
 		if (spl_filesystem_object_get_file_name(intern) != SUCCESS) {
 			RETURN_THROWS();
 		}
-		if (!allow_links && !(intern->flags & SPL_FILE_DIR_FOLLOW_SYMLINKS)) {
-			php_stat(intern->file_name, FS_IS_LINK, return_value);
-			if (zend_is_true(return_value)) {
+		php_stat(intern->file_name, FS_LPERMS, return_value);
+		if (S_ISLNK(Z_LVAL_P(return_value))) {
+			if (!allow_links
+			 && !(intern->flags & SPL_FILE_DIR_FOLLOW_SYMLINKS)) {
 				RETURN_FALSE;
 			}
+			php_stat(intern->file_name, FS_PERMS, return_value);
 		}
-		php_stat(intern->file_name, FS_IS_DIR, return_value);
+		RETURN_BOOL(S_ISDIR(Z_LVAL_P(return_value)));
     }
 }
 /* }}} */

Diff for: ext/standard/filestat.c

@@ -714,7 +714,7 @@ PHP_FUNCTION(clearstatcache)
 }
 /* }}} */
 
-#define IS_LINK_OPERATION(__t) ((__t) == FS_TYPE || (__t) == FS_IS_LINK || (__t) == FS_LSTAT)
+#define IS_LINK_OPERATION(__t) ((__t) == FS_TYPE || (__t) == FS_IS_LINK || (__t) == FS_LSTAT || (__t) == FS_LPERMS)
 #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)
 #define IS_ACCESS_CHECK(__t) (IS_ABLE_CHECK(type) || (__t) == FS_EXISTS)
@@ -824,7 +824,9 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
 			}
 			BG(CurrentLStatFile) = zend_string_copy(filename);
 			memcpy(&BG(lssb), &ssb, sizeof(php_stream_statbuf));
-		} else {
+		}
+		if (!(flags & PHP_STREAM_URL_STAT_LINK)
+		 || !S_ISLNK(ssb.sb.st_mode)) {
 			if (BG(CurrentStatFile)) {
 				zend_string_release(BG(CurrentStatFile));
 			}
@@ -878,6 +880,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
 
 	switch (type) {
 	case FS_PERMS:
+	case FS_LPERMS:
 		RETURN_LONG((zend_long)ssb.sb.st_mode);
 	case FS_INODE:
 		RETURN_LONG((zend_long)ssb.sb.st_ino);

Diff for: ext/standard/php_filestat.h

@@ -62,5 +62,6 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value);
 #define FS_EXISTS  15
 #define FS_LSTAT   16
 #define FS_STAT    17
+#define FS_LPERMS  18
 
 #endif /* PHP_FILESTAT_H */