mirror of
https://github.com/caddyserver/caddy.git
synced 2024-11-29 20:24:11 +08:00
browse: Emit datetime in UTC instead of the server's timezone
Makes sure the view is the same no matter where a site is hosted.
This commit is contained in:
parent
cc6aa6b54b
commit
7f35600b28
|
@ -217,7 +217,7 @@ func directoryListing(files []os.FileInfo, canGoUp bool, urlPath string) (Listin
|
||||||
Name: f.Name(),
|
Name: f.Name(),
|
||||||
Size: f.Size(),
|
Size: f.Size(),
|
||||||
URL: url.String(),
|
URL: url.String(),
|
||||||
ModTime: f.ModTime(),
|
ModTime: f.ModTime().UTC(),
|
||||||
Mode: f.Mode(),
|
Mode: f.Mode(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -238,7 +238,7 @@ func TestBrowseJson(t *testing.T) {
|
||||||
// Tests fail in CI environment because all file mod times are the same for
|
// Tests fail in CI environment because all file mod times are the same for
|
||||||
// some reason, making the sorting unpredictable. To hack around this,
|
// some reason, making the sorting unpredictable. To hack around this,
|
||||||
// we ensure here that each file has a different mod time.
|
// we ensure here that each file has a different mod time.
|
||||||
chTime := f.ModTime().Add(-(time.Duration(i) * time.Second))
|
chTime := f.ModTime().UTC().Add(-(time.Duration(i) * time.Second))
|
||||||
if err := os.Chtimes(filepath.Join(testDataPath, name), chTime, chTime); err != nil {
|
if err := os.Chtimes(filepath.Join(testDataPath, name), chTime, chTime); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user