qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 13:00:07 -07:00
Code Releases Activity

net/http: merge IsDir checks in fs.go's serveFile function

Browse Source 
Fixes #33385
This commit is contained in:
spacewander 2019-08-02 10:00:04 +08:00
parent fa7d40abe0
commit 3bf483808e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/http/fs.go
View File

@ -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() { if d.IsDir() {
url := r.URL.Path url := r.URL.Path
// redirect if the directory name doesn't end in a slash
if url == "" || url[len(url)-1] != '/' { if url == "" || url[len(url)-1] != '/' {
localRedirect(w, r, path.Base(url)+"/") localRedirect(w, r, path.Base(url)+"/")
return return
} }
}
// use contents of index.html for directory, if present // use contents of index.html for directory, if present
if d.IsDir() {
index := strings.TrimSuffix(name, "/") + indexPage index := strings.TrimSuffix(name, "/") + indexPage
ff, err := fs.Open(index) ff, err := fs.Open(index)
if err == nil { if err == nil {