From: Anatol Belski <ab@php.net>
Date: Sun, 8 Mar 2015 19:05:34 +0000 (+0100)
Subject: partially revert wrong merge
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~762^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5558138d71a71511efe0c9a4ede557a9ca3c899;p=php

partially revert wrong merge
---

diff --git a/ext/fileinfo/libmagic/fsmagic.c b/ext/fileinfo/libmagic/fsmagic.c
index 6a8f8f1eb3..7f9211597d 100644
--- a/ext/fileinfo/libmagic/fsmagic.c
+++ b/ext/fileinfo/libmagic/fsmagic.c
@@ -107,16 +107,6 @@ file_fsmagic(struct magic_set *ms, const char *fn, zend_stat_t *sb, php_stream *
 	}
 
 #define COMMA	(did++ ? ", " : "")
-	/*
-	 * Fstat is cheaper but fails for files you don't have read perms on.
-	 * On 4.2BSD and similar systems, use lstat() to identify symlinks.
-	 */
-#ifdef	S_IFLNK
-	if ((ms->flags & MAGIC_SYMLINK) == 0)
-		ret = lstat(fn, sb);
-	else
-#endif
-	ret = stat(fn, sb);	/* don't merge into if; see "ret =" above */
 
 	if (stream) {
 		php_stream_statbuf ssb;