diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2023-02-06 11:29:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 11:29:20 -0500 |
| commit | e62b5fb58619364051551a7ee614fb9949cfe69a (patch) | |
| tree | a08ff753dde04763b8a36a564b2b0504a86f4262 /modules | |
| parent | 94b8d56096b2581d6739b057655e7b895c8fd3bb (diff) | |
chore: Build with Go 1.20, keep minimum at 1.18 for now (#5353)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddyhttp/app.go | 4 | ||||
| -rw-r--r-- | modules/caddyhttp/caddyhttp.go | 2 | ||||
| -rw-r--r-- | modules/caddyhttp/server.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/caddyhttp/app.go b/modules/caddyhttp/app.go index d790284..da25d37 100644 --- a/modules/caddyhttp/app.go +++ b/modules/caddyhttp/app.go @@ -574,7 +574,7 @@ func (app *App) Stop() error { // TODO: we have to manually close our listeners because quic-go won't // close listeners it didn't create along with the server itself... - // see https://github.com/lucas-clemente/quic-go/issues/3560 + // see https://github.com/quic-go/quic-go/issues/3560 for _, el := range server.h3listeners { if err := el.Close(); err != nil { app.logger.Error("HTTP/3 listener close", @@ -583,7 +583,7 @@ func (app *App) Stop() error { } } - // TODO: CloseGracefully, once implemented upstream (see https://github.com/lucas-clemente/quic-go/issues/2103) + // TODO: CloseGracefully, once implemented upstream (see https://github.com/quic-go/quic-go/issues/2103) if err := server.h3server.Close(); err != nil { app.logger.Error("HTTP/3 server shutdown", zap.Error(err), diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go index c9cc9e6..c497dc7 100644 --- a/modules/caddyhttp/caddyhttp.go +++ b/modules/caddyhttp/caddyhttp.go @@ -232,7 +232,7 @@ func SanitizedPathJoin(root, reqPath string) string { root = "." } - path := filepath.Join(root, filepath.Clean("/"+reqPath)) + path := filepath.Join(root, path.Clean("/"+reqPath)) // filepath.Join also cleans the path, and cleaning strips // the trailing slash, so we need to re-add it afterwards. diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index f50abf0..420cc4a 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -33,8 +33,8 @@ import ( "github.com/caddyserver/caddy/v2/modules/caddyevents" "github.com/caddyserver/caddy/v2/modules/caddytls" "github.com/caddyserver/certmagic" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) |