httpcaddyfile: Group try_files routes together (#2891)

This ensures that only the first matching route is used.

1 files changed, 5 insertions, 0 deletions

diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go
index d26b435..67ae4f4 100644
--- a/modules/caddyhttp/fileserver/caddyfile.go
+++ b/modules/caddyhttp/fileserver/caddyfile.go
@@ -163,5 +163,10 @@ func parseTryFiles(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
 		result = append(result, makeRoute(try, "")...)
 	}
 
+	// ensure that multiple routes (possible if rewrite targets
+	// have query strings, for example) are grouped together
+	// so only the first matching rewrite is performed (#2891)
+	h.GroupRoutes(result)
+
 	return result, nil
 }