Browse Source

headers: Fix Caddyfile parsing with request matcher (#3892)

master
Francis Lavoie 5 years ago
committed by GitHub
parent
commit
a26f70a12b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      caddytest/integration/caddyfile_adapt/header.txt
  2. 4
      modules/caddyhttp/headers/caddyfile.go

25
caddytest/integration/caddyfile_adapt/header.txt

@ -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": [
{

4
modules/caddyhttp/headers/caddyfile.go

@ -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

Loading…
Cancel
Save