cmd/ipfs: gatewayHandler: Fixed directory listing getting appended to index.html pages

core/corehttp/gateway_handler.go

@@ -130,13 +130,11 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// storage for directory listing
 	var dirListing []directoryItem
 	// loop through files
+	foundIndex := false
 	for _, link := range nd.Links {
-		if link.Name != "index.html" {
-			dirListing = append(dirListing, directoryItem{link.Size, link.Name})
-			continue
-		}
-
+		if link.Name == "index.html" {
 			log.Debug("found index")
+			foundIndex = true
 			// return index page instead.
 			nd, err := i.ResolvePath(path + "/index.html")
 			if err != nil {
@@ -150,14 +148,20 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			}
 			// write to request
 			io.Copy(w, dr)
+			break
 		}
 
+		dirListing = append(dirListing, directoryItem{link.Size, link.Name})
+	}
+
+	if !foundIndex {
 		// template and return directory listing
 		hndlr := webHandler{"listing": dirListing, "path": path}
 		if err := i.dirList.Execute(w, hndlr); err != nil {
 			internalWebError(w, err)
 			return
 		}
+	}
 }
 
 func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {