github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-23 02:29:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved fileServer and browse.IndexPages into middleware package

Browse Source
This commit is contained in:
Matthew Holt
2015-09-19 20:34:23 -06:00
parent 540a651fdf
commit 10ab037833
5 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
middleware/browse/browse.go
View File

@ -56,7 +56,7 @@ type Listing struct {
// And which order
Order string
// User defined costum variables
// Optional custom variables for use in browse templates
User interface{}
middleware.Context
@ -138,15 +138,6 @@ func (fi FileInfo) HumanModTime(format string) string {
return fi.ModTime.Format(format)
}
var IndexPages = []string{
"index.html",
"index.htm",
"index.txt",
"default.html",
"default.htm",
"default.txt",
}
func directoryListing(files []os.FileInfo, r *http.Request, canGoUp bool, root string, ignoreIndexes bool, vars interface{}) (Listing, error) {
var fileinfos []FileInfo
var urlPath = r.URL.Path
@ -155,7 +146,7 @@ func directoryListing(files []os.FileInfo, r *http.Request, canGoUp bool, root s
// Directory is not browsable if it contains index file
if !ignoreIndexes {
for _, indexName := range IndexPages {
for _, indexName := range middleware.IndexPages {
if name == indexName {
return Listing{}, errors.New("Directory contains index file, not browsable!")
}