1
0
mirror of https://github.com/kataras/iris.git synced 2026-01-09 13:05:56 +00:00

Update to version 12.1.4

Former-commit-id: aeb039ea25a831ad1087b1994be97b349a8ed4aa
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-12-29 19:14:41 +02:00
parent a30fe26095
commit 269b832ade
16 changed files with 30 additions and 20 deletions

View File

@@ -95,7 +95,7 @@ func (f *embeddedFile) Stat() (os.FileInfo, error) {
}
// func (f *embeddedFile) Name() string {
// return strings.TrimLeft(f.vdir, f.FileInfo.Name())
// return strings.TrimPrefix(f.vdir, f.FileInfo.Name())
// }
type embeddedFileSystem struct {
@@ -109,7 +109,7 @@ type embeddedFileSystem struct {
var _ http.FileSystem = (*embeddedFileSystem)(nil)
func (fs *embeddedFileSystem) Open(name string) (http.File, error) {
// name = fs.vdir + name <- no need, check the TrimLeft(name, vdir) on names loop and the asset and assetInfo redefined on `HandleDir`.
// name = fs.vdir + name <- no need, check the TrimPrefix(name, vdir) on names loop and the asset and assetInfo redefined on `HandleDir`.
if d, ok := fs.dirNames[name]; ok {
return d, nil
}
@@ -221,7 +221,7 @@ func FileServer(directory string, opts ...DirOptions) context.Handler {
continue
}
names = append(names, strings.TrimLeft(name, vdir))
names = append(names, strings.TrimPrefix(name, vdir))
}
if len(names) == 0 {