From e84f7c65283965576905c7ef4b6e1fa314ec270e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 11 Feb 2026 15:12:54 +0100 Subject: [PATCH] chore(caddy): modernize for Go 1.26 --- caddy/module.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/caddy/module.go b/caddy/module.go index 908129f88..deef2e072 100644 --- a/caddy/module.go +++ b/caddy/module.go @@ -108,8 +108,7 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error { } else { f.Root = filepath.Join(frankenphp.EmbeddedAppPath, defaultDocumentRoot) - var rrs bool - f.ResolveRootSymlink = &rrs + f.ResolveRootSymlink = new(false) } } else if frankenphp.EmbeddedAppPath != "" && filepath.IsLocal(f.Root) { f.Root = filepath.Join(frankenphp.EmbeddedAppPath, f.Root) @@ -126,8 +125,7 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error { } if f.ResolveRootSymlink == nil { - rrs := true - f.ResolveRootSymlink = &rrs + f.ResolveRootSymlink = new(true) } if !needReplacement(f.Root) { @@ -189,7 +187,6 @@ func needReplacement(s string) bool { // ServeHTTP implements caddyhttp.MiddlewareHandler. func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ caddyhttp.Handler) error { ctx := r.Context() - origReq := ctx.Value(caddyhttp.OriginalRequestCtxKey).(http.Request) repl := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer) documentRoot := f.resolvedDocumentRoot @@ -230,7 +227,7 @@ func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ c r, append( opts, - frankenphp.WithOriginalRequest(&origReq), + frankenphp.WithOriginalRequest(new(ctx.Value(caddyhttp.OriginalRequestCtxKey).(http.Request))), frankenphp.WithWorkerName(workerName), )..., ) @@ -467,8 +464,7 @@ func parsePhpServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error) if phpsrv.Root == "" { phpsrv.Root = filepath.Join(frankenphp.EmbeddedAppPath, defaultDocumentRoot) fsrv.Root = phpsrv.Root - rrs := false - phpsrv.ResolveRootSymlink = &rrs + phpsrv.ResolveRootSymlink = new(false) } else if filepath.IsLocal(fsrv.Root) { phpsrv.Root = filepath.Join(frankenphp.EmbeddedAppPath, phpsrv.Root) fsrv.Root = phpsrv.Root