mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-11-04 09:29:18 +08:00 
			
		
		
		
	headers: Fix Caddyfile parsing with request matcher (#3892)
This commit is contained in:
		@ -9,6 +9,10 @@
 | 
			
		||||
		?Tim "Berners-Lee"
 | 
			
		||||
		defer
 | 
			
		||||
	}
 | 
			
		||||
	@images path /images/*
 | 
			
		||||
	header @images {
 | 
			
		||||
		Cache-Control "public, max-age=3600, stale-while-revalidate=86400"
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
----------
 | 
			
		||||
{
 | 
			
		||||
@ -20,6 +24,27 @@
 | 
			
		||||
						":80"
 | 
			
		||||
					],
 | 
			
		||||
					"routes": [
 | 
			
		||||
						{
 | 
			
		||||
							"match": [
 | 
			
		||||
								{
 | 
			
		||||
									"path": [
 | 
			
		||||
										"/images/*"
 | 
			
		||||
									]
 | 
			
		||||
								}
 | 
			
		||||
							],
 | 
			
		||||
							"handle": [
 | 
			
		||||
								{
 | 
			
		||||
									"handler": "headers",
 | 
			
		||||
									"response": {
 | 
			
		||||
										"set": {
 | 
			
		||||
											"Cache-Control": [
 | 
			
		||||
												"public, max-age=3600, stale-while-revalidate=86400"
 | 
			
		||||
											]
 | 
			
		||||
										}
 | 
			
		||||
									}
 | 
			
		||||
								}
 | 
			
		||||
							]
 | 
			
		||||
						},
 | 
			
		||||
						{
 | 
			
		||||
							"handle": [
 | 
			
		||||
								{
 | 
			
		||||
 | 
			
		||||
@ -46,6 +46,10 @@ func init() {
 | 
			
		||||
// and ? conditionally sets a value only if the header field is not already
 | 
			
		||||
// set.
 | 
			
		||||
func parseCaddyfile(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error) {
 | 
			
		||||
	if !h.Next() {
 | 
			
		||||
		return nil, h.ArgErr()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	matcherSet, err := h.ExtractMatcherSet()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user