summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--caddytest/integration/caddyfile_adapt/request_header.txt90
-rw-r--r--modules/caddyhttp/headers/caddyfile.go4
2 files changed, 94 insertions, 0 deletions
diff --git a/caddytest/integration/caddyfile_adapt/request_header.txt b/caddytest/integration/caddyfile_adapt/request_header.txt
new file mode 100644
index 0000000..bab3fca
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/request_header.txt
@@ -0,0 +1,90 @@
+:80
+
+@matcher path /something*
+request_header @matcher Denis "Ritchie"
+
+request_header +Edsger "Dijkstra"
+request_header -Wolfram
+
+@images path /images/*
+request_header @images Cache-Control "public, max-age=3600, stale-while-revalidate=86400"
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":80"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "path": [
+ "/something*"
+ ]
+ }
+ ],
+ "handle": [
+ {
+ "handler": "headers",
+ "request": {
+ "set": {
+ "Denis": [
+ "Ritchie"
+ ]
+ }
+ }
+ }
+ ]
+ },
+ {
+ "match": [
+ {
+ "path": [
+ "/images/*"
+ ]
+ }
+ ],
+ "handle": [
+ {
+ "handler": "headers",
+ "request": {
+ "set": {
+ "Cache-Control": [
+ "public, max-age=3600, stale-while-revalidate=86400"
+ ]
+ }
+ }
+ }
+ ]
+ },
+ {
+ "handle": [
+ {
+ "handler": "headers",
+ "request": {
+ "add": {
+ "Edsger": [
+ "Dijkstra"
+ ]
+ }
+ }
+ },
+ {
+ "handler": "headers",
+ "request": {
+ "delete": [
+ "Wolfram"
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ }
+}
diff --git a/modules/caddyhttp/headers/caddyfile.go b/modules/caddyhttp/headers/caddyfile.go
index 574e54b..c6ea2fb 100644
--- a/modules/caddyhttp/headers/caddyfile.go
+++ b/modules/caddyhttp/headers/caddyfile.go
@@ -151,6 +151,10 @@ func parseCaddyfile(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
// request_header [<matcher>] [[+|-]<field> [<value|regexp>] [<replacement>]]
//
func parseReqHdrCaddyfile(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error) {
+ if !h.Next() {
+ return nil, h.ArgErr()
+ }
+
matcherSet, err := h.ExtractMatcherSet()
if err != nil {
return nil, err