change was merged upstream

Author: henderkes

caddy/go.mod

@@ -4,12 +4,10 @@ go 1.26.0
 
 replace github.com/dunglas/frankenphp => ../
 
-replace github.com/caddyserver/caddy/v2 => github.com/henderkes/caddy/v2 v2.11.3-rc.frankenphp
-
 retract v1.0.0-rc.1 // Human error
 
 require (
-	github.com/caddyserver/caddy/v2 v2.11.2
+	github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f
 	github.com/caddyserver/certmagic v0.25.2
 	github.com/dunglas/caddy-cbrotli v1.0.1
 	github.com/dunglas/frankenphp v1.12.1

caddy/go.sum

@@ -95,6 +95,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=
 github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f h1:UmlXx5sytQ3IwWTA8kN/e9AJyaKgeZ2N1jEInipX3HQ=
+github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f/go.mod h1:eu0tCpKfbDkztZ5znboBOWG95MaypGCiEe2+455hZIA=
 github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc=
 github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg=
 github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=
@@ -247,8 +249,6 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/henderkes/caddy/v2 v2.11.3-rc.frankenphp h1:8rl6av7lG/8VWLT8kpyCH9AXGvb091DM96G6o/3gP+U=
-github.com/henderkes/caddy/v2 v2.11.3-rc.frankenphp/go.mod h1:eu0tCpKfbDkztZ5znboBOWG95MaypGCiEe2+455hZIA=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=

caddy/module.go

@@ -689,7 +689,7 @@ func prependWorkerRoutes(routes caddyhttp.RouteList, h httpcaddyfile.Helper, f F
 
 func extractSiteRoot(h httpcaddyfile.Helper) string {
 	// Caddy stores only unmatched or wildcard matcher roots
-	if root, ok := h.State["root"].(string); ok {
+	if root, ok := h.BlockState["root"].(string); ok {
 		return root
 	}
 	return ""