serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-03 17:43:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Export staticfiles.Redirect for convenience in preserving query string

Browse source
This commit is contained in:
Matthew Holt 2016-08-06 14:40:58 -06:00
parent 4c6082df64
commit ee615371a8
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddyhttp/browse/browse.go
View file

@ -288,7 +288,7 @@ inScope:
// Browsing navigation gets messed up if browsing a directory
// that doesn't end in "/" (which it should, anyway)
if !strings.HasSuffix(r.URL.Path, "/") {
http.Redirect(w, r, r.URL.Path+"/", http.StatusTemporaryRedirect)
staticfiles.Redirect(w, r, r.URL.Path+"/", http.StatusTemporaryRedirect)
return 0, nil
}

14
caddyhttp/staticfiles/fileserver.go
View file

@ -81,13 +81,13 @@ func (fs FileServer) serveFile(w http.ResponseWriter, r *http.Request, name stri
if d.IsDir() {
// Ensure / at end of directory url
if !strings.HasSuffix(url, "/") {
redirect(w, r, path.Base(url)+"/")
Redirect(w, r, path.Base(url)+"/", http.StatusMovedPermanently)
return http.StatusMovedPermanently, nil
}
} else {
// Ensure no / at end of file url
if strings.HasSuffix(url, "/") {
redirect(w, r, "../"+path.Base(url))
Redirect(w, r, "../"+path.Base(url), http.StatusMovedPermanently)
return http.StatusMovedPermanently, nil
}
}
@ -149,14 +149,14 @@ func (fs FileServer) isHidden(d os.FileInfo) bool {
return false
}
// redirect is taken from http.localRedirect of the std lib. It
// sends an HTTP permanent redirect to the client but will
// preserve the query string for the new path.
func redirect(w http.ResponseWriter, r *http.Request, newPath string) {
// Redirect sends an HTTP redirect to the client but will preserve
// the query string for the new path. Based on http.localRedirect
// from the Go standard library.
func Redirect(w http.ResponseWriter, r *http.Request, newPath string, statusCode int) {
if q := r.URL.RawQuery; q != "" {
newPath += "?" + q
}
http.Redirect(w, r, newPath, http.StatusMovedPermanently)
http.Redirect(w, r, newPath, statusCode)
}
// IndexPages is a list of pages that may be understood as