mirror of
https://github.com/caddyserver/caddy.git
synced 2025-01-14 06:46:27 +03:00
staticfiles: Expand placeholder for index files (#4679)
This commit is contained in:
parent
7d229665ed
commit
afca242111
3 changed files with 25 additions and 0 deletions
|
@ -101,3 +101,27 @@ func TestReadCookie(t *testing.T) {
|
||||||
// act and assert
|
// act and assert
|
||||||
tester.AssertGetResponse("http://localhost:9080/cookie.html", 200, "<h2>Cookie.ClientName caddytest</h2>")
|
tester.AssertGetResponse("http://localhost:9080/cookie.html", 200, "<h2>Cookie.ClientName caddytest</h2>")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReplIndex(t *testing.T) {
|
||||||
|
|
||||||
|
tester := caddytest.NewTester(t)
|
||||||
|
tester.InitServer(`
|
||||||
|
{
|
||||||
|
http_port 9080
|
||||||
|
https_port 9443
|
||||||
|
}
|
||||||
|
|
||||||
|
localhost:9080 {
|
||||||
|
templates {
|
||||||
|
root testdata
|
||||||
|
}
|
||||||
|
file_server {
|
||||||
|
root testdata
|
||||||
|
index "index.{host}.html"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`, "caddyfile")
|
||||||
|
|
||||||
|
// act and assert
|
||||||
|
tester.AssertGetResponse("http://localhost:9080/", 200, "")
|
||||||
|
}
|
||||||
|
|
0
caddytest/integration/testdata/index.localhost.html
vendored
Normal file
0
caddytest/integration/testdata/index.localhost.html
vendored
Normal file
|
@ -200,6 +200,7 @@ func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next c
|
||||||
var implicitIndexFile bool
|
var implicitIndexFile bool
|
||||||
if info.IsDir() && len(fsrv.IndexNames) > 0 {
|
if info.IsDir() && len(fsrv.IndexNames) > 0 {
|
||||||
for _, indexPage := range fsrv.IndexNames {
|
for _, indexPage := range fsrv.IndexNames {
|
||||||
|
indexPage := repl.ReplaceAll(indexPage, "")
|
||||||
indexPath := caddyhttp.SanitizedPathJoin(filename, indexPage)
|
indexPath := caddyhttp.SanitizedPathJoin(filename, indexPage)
|
||||||
if fileHidden(indexPath, filesToHide) {
|
if fileHidden(indexPath, filesToHide) {
|
||||||
// pretend this file doesn't exist
|
// pretend this file doesn't exist
|
||||||
|
|
Loading…
Reference in a new issue