From a26f70a12b1289231d705bc002fe1df3180cb6c5 Mon Sep 17 00:00:00 2001
From: Francis Lavoie <lavofr@gmail.com>
Date: Mon, 30 Nov 2020 12:20:30 -0500
Subject: headers: Fix Caddyfile parsing with request matcher (#3892)

---
 modules/caddyhttp/headers/caddyfile.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules')

diff --git a/modules/caddyhttp/headers/caddyfile.go b/modules/caddyhttp/headers/caddyfile.go
index 75498b2..574e54b 100644
--- a/modules/caddyhttp/headers/caddyfile.go
+++ b/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
-- 
cgit v1.2.3