Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
header: caddyfile: Defer header operations for deletions or manually
See https://caddy.community/t/caddy-server-that-returns-only-ip-address-as-text/6928/6?u=matt In most cases, we will want to apply header operations immediately, rather than waiting until the response is written. The exceptions are generally going to be if we are deleting a header field or if a field is to be overwritten. We now automatically defer header ops if deleting a header field, and allow the user to manually enable deferred mode with the defer subdirective.
Matthew Holt committed
Feb 4, 2020 at 11:05 UTC
9639fe7d2864848f72c8ca3adae025954cbfec1f
2 files changed
+17
-3
modules/caddyhttp/headers/caddyfile.go
+15
-3
@@ -33,10 +33,13 @@ func init() {
33
// header [<matcher>] [[+|-]<field> [<value|regexp>] [<replacement>]] {
34
// [+]<field> [<value|regexp> [<replacement>]]
35
// -<field>
36
+// [defer]
37
// }
38
//
39
// Either a block can be opened or a single header field can be configured
39
-// in the first line, but not both in the same directive.
40
+// in the first line, but not both in the same directive. Header operations
41
+// are deferred to write-time if any headers are being deleted or if the
42
+// 'defer' subdirective is used.
43
func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
44
hdr := new(Handler)
45
@@ -44,7 +47,6 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
47
if hdr.Response == nil {
48
hdr.Response = &RespHeaderOps{
49
HeaderOps: new(HeaderOps),
47
- Deferred: true,
50
}
51
}
52
}
@@ -64,14 +66,21 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
66
}
67
makeResponseOps()
68
CaddyfileHeaderOp(hdr.Response.HeaderOps, field, value, replacement)
69
+ if len(hdr.Response.HeaderOps.Delete) > 0 {
70
+ hdr.Response.Deferred = true
71
+ }
72
}
73
74
// if not, they should be in a block
75
for h.NextBlock(0) {
76
+ field := h.Val()
77
+ if field == "defer" {
78
+ hdr.Response.Deferred = true
79
+ continue
80
+ }
81
if hasArgs {
82
return nil, h.Err("cannot specify headers in both arguments and block")
83
}
74
- field := h.Val()
84
var value, replacement string
85
if h.NextArg() {
86
value = h.Val()
@@ -81,6 +90,9 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
90
}
91
makeResponseOps()
92
CaddyfileHeaderOp(hdr.Response.HeaderOps, field, value, replacement)
93
+ if len(hdr.Response.HeaderOps.Delete) > 0 {
94
+ hdr.Response.Deferred = true
95
+ }
96
}
97
}
98
modules/caddyhttp/headers/headers.go
+2
@@ -178,6 +178,8 @@ type RespHeaderOps struct {
178
179
// If true, header operations will be deferred until
180
// they are written out. Superceded if Require is set.
181
+ // Usually you will need to set this to true if any
182
+ // fields are being deleted.
183
Deferred bool `json:"deferred,omitempty"`
184
}
185