From 3bf483808e10a13c522df02c2fc55fe278044680 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Fri, 2 Aug 2019 10:00:04 +0800
Subject: [PATCH] net/http: merge IsDir checks in fs.go's serveFile function

Fixes #33385
---
 src/net/http/fs.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/net/http/fs.go b/src/net/http/fs.go
index 4c4f0e429e..27512411de 100644
--- a/src/net/http/fs.go
+++ b/src/net/http/fs.go
@@ -582,17 +582,15 @@ func serveFile(w ResponseWriter, r *Request, fs FileSystem, name string, redirec
 		}
 	}
 
-	// redirect if the directory name doesn't end in a slash
 	if d.IsDir() {
 		url := r.URL.Path
+		// redirect if the directory name doesn't end in a slash
 		if url == "" || url[len(url)-1] != '/' {
 			localRedirect(w, r, path.Base(url)+"/")
 			return
 		}
-	}
 
-	// use contents of index.html for directory, if present
-	if d.IsDir() {
+		// use contents of index.html for directory, if present
 		index := strings.TrimSuffix(name, "/") + indexPage
 		ff, err := fs.Open(index)
 		if err == nil {