mirror of https://github.com/caddyserver/caddy.git
Minor tweaks
This commit is contained in:
parent
f217181293
commit
bdf92ee84e
7
caddy.go
7
caddy.go
|
@ -208,8 +208,8 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
|
|||
// If no version information is available, a non-nil
|
||||
// value will still be returned, but with an
|
||||
// unknown version.
|
||||
func GoModule() *debug.Module {
|
||||
mod := &debug.Module{Version: "unknown"}
|
||||
func GoModule() debug.Module {
|
||||
mod := debug.Module{Version: "unknown"}
|
||||
bi, ok := debug.ReadBuildInfo()
|
||||
if ok {
|
||||
mod.Path = bi.Main.Path
|
||||
|
@ -219,9 +219,10 @@ func GoModule() *debug.Module {
|
|||
// once that issue is fixed, we should just be able to use bi.Main... hopefully.
|
||||
for _, dep := range bi.Deps {
|
||||
if dep.Path == mod.Path {
|
||||
return dep
|
||||
return *dep
|
||||
}
|
||||
}
|
||||
return bi.Main
|
||||
}
|
||||
return mod
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ func init() {
|
|||
})
|
||||
}
|
||||
|
||||
// Zstd can create zstd encoders.
|
||||
// Zstd can create Zstandard encoders.
|
||||
type Zstd struct{}
|
||||
|
||||
// AcceptEncoding returns the name of the encoding as
|
||||
|
|
|
@ -76,9 +76,8 @@ func (m MatchFile) Match(r *http.Request) bool {
|
|||
if matched {
|
||||
repl.Set("http.matchers.file.relative", rel)
|
||||
repl.Set("http.matchers.file.absolute", abs)
|
||||
return true
|
||||
}
|
||||
return false
|
||||
return matched
|
||||
}
|
||||
|
||||
// selectFile chooses a file according to m.TryPolicy by appending
|
||||
|
|
Loading…
Reference in New Issue