summaryrefslogtreecommitdiff
path: root/caddyconfig/httpcaddyfile
diff options
context:
space:
mode:
authorGilbert Gilb's <gilbsgilbs@users.noreply.github.com>2020-11-20 20:38:16 +0100
committerGitHub <noreply@github.com>2020-11-20 12:38:16 -0700
commitb0d5c2c8ae076393e7a3ad59ce875027f4c29304 (patch)
treeb5732f90ace27a26d249977490956371ee883e40 /caddyconfig/httpcaddyfile
parent12cc69ab7adee166042795773874b9d4d38c8d57 (diff)
headers: Support default header values in Caddyfile with '?' (#3807)
* implement default values for header directive closes #3804 * remove `set_default` header op and rely on "require" handler instead This has the following advantages over the previous attempt: - It does not introduce a new operation for headers, but rather nicely extends over an existing feature in the header handler. - It removes the need to specify the header as "deferred" because it is already implicitely deferred by the use of the require handler. This should be less confusing to the user. * add integration test for header directive in caddyfile * bubble up errors when parsing caddyfile header directive * don't export unnecessarily and don't canonicalize headers unnecessarily * fix response headers not passed in blocks * caddyfile: fix clash when using default header in block Each header is now set in a separate handler so that it doesn't clash with other headers set/added/deleted in the same block. * caddyhttp: New idle_timeout default of 5m * reverseproxy: fix random hangs on http/2 requests with server push (#3875) see https://github.com/golang/go/issues/42534 * Refactor and cleanup with improvements * More specific link Co-authored-by: Matthew Holt <mholt@users.noreply.github.com> Co-authored-by: Денис Телюх <telyukh.denis@gmail.com>
Diffstat (limited to 'caddyconfig/httpcaddyfile')
-rw-r--r--caddyconfig/httpcaddyfile/directives.go18
1 files changed, 7 insertions, 11 deletions
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index afa2cd4..4ab8778 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -103,20 +103,11 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, h.ArgErr()
}
- matcherSet, ok, err := h.MatcherToken()
+ matcherSet, err := h.ExtractMatcherSet()
if err != nil {
return nil, err
}
- if ok {
- // strip matcher token; we don't need to
- // use the return value here because a
- // new dispenser should have been made
- // solely for this directive's tokens,
- // with no other uses of same slice
- h.Dispenser.Delete()
- }
- h.Dispenser.Reset() // pretend this lookahead never happened
val, err := setupFunc(h)
if err != nil {
return nil, err
@@ -201,7 +192,12 @@ func (h Helper) ExtractMatcherSet() (caddy.ModuleMap, error) {
return nil, err
}
if hasMatcher {
- h.Dispenser.Delete() // strip matcher token
+ // strip matcher token; we don't need to
+ // use the return value here because a
+ // new dispenser should have been made
+ // solely for this directive's tokens,
+ // with no other uses of same slice
+ h.Dispenser.Delete()
}
h.Dispenser.Reset() // pretend this lookahead never happened
return matcherSet, nil