Use reported fstat filesize for PHP streams

Author: nikic

Zend/zend_stream.c

@@ -48,26 +48,16 @@ static size_t zend_stream_stdio_fsizer(void *handle) /* {{{ */
 #endif
 		return buf.st_size;
 	}
-	return 0;
+	return -1;
 } /* }}} */
 
 static size_t zend_stream_fsize(zend_file_handle *file_handle) /* {{{ */
 {
-	zend_stat_t buf;
-
-	if (file_handle->type == ZEND_HANDLE_STREAM) {
-		return file_handle->handle.stream.fsizer(file_handle->handle.stream.handle);
-	}
-	if (file_handle->handle.fp && zend_fstat(fileno(file_handle->handle.fp), &buf) == 0) {
-#ifdef S_ISREG
-		if (!S_ISREG(buf.st_mode)) {
-			return 0;
-		}
-#endif
-		return buf.st_size;
+	ZEND_ASSERT(file_handle->type == ZEND_HANDLE_STREAM);
+	if (file_handle->handle.stream.isatty) {
+		return 0;
 	}
-
-	return -1;
+	return file_handle->handle.stream.fsizer(file_handle->handle.stream.handle);
 } /* }}} */
 
 ZEND_API void zend_stream_init_fp(zend_file_handle *handle, FILE *fp, const char *filename) {
@@ -126,7 +116,6 @@ static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t
 ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t *len) /* {{{ */
 {
 	size_t size;
-	zend_bool is_fp = 0;
 
 	if (file_handle->buf) {
 		*buf = file_handle->buf;
@@ -145,7 +134,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
 			return FAILURE;
 		}
 
-		is_fp = 1;
 		file_handle->type = ZEND_HANDLE_STREAM;
 		file_handle->handle.stream.handle = file_handle->handle.fp;
 		file_handle->handle.stream.isatty = isatty(fileno((FILE *)file_handle->handle.stream.handle));
@@ -159,7 +147,7 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
 		return FAILURE;
 	}
 
-	if (is_fp && !file_handle->handle.stream.isatty && size) {
+	if (size) {
 		file_handle->buf = *buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
 		file_handle->len = zend_stream_read(file_handle, *buf, size);
 	} else {