From 2105d59936039f6ddbe3214711d160e1804523a0 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Wed, 22 Jan 2020 09:33:53 -0700
Subject: httpcaddyfile: Rename 'headers' directive to 'header'

---
 caddyconfig/httpcaddyfile/directives.go | 2 +-
 modules/caddyhttp/headers/caddyfile.go  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index 94dac21..035dcbe 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -38,7 +38,7 @@ var directiveOrder = []string{
 	"try_files",
 
 	"basicauth",
-	"headers",
+	"header",
 	"request_header",
 	"encode",
 	"templates",
diff --git a/modules/caddyhttp/headers/caddyfile.go b/modules/caddyhttp/headers/caddyfile.go
index 55ad991..ee1a81a 100644
--- a/modules/caddyhttp/headers/caddyfile.go
+++ b/modules/caddyhttp/headers/caddyfile.go
@@ -23,14 +23,14 @@ import (
 )
 
 func init() {
-	httpcaddyfile.RegisterHandlerDirective("headers", parseCaddyfile)
+	httpcaddyfile.RegisterHandlerDirective("header", parseCaddyfile)
 	httpcaddyfile.RegisterHandlerDirective("request_header", parseReqHdrCaddyfile)
 }
 
 // parseCaddyfile sets up the handler for response headers from
 // Caddyfile tokens. Syntax:
 //
-//     headers [<matcher>] [[+|-]<field> [<value|regexp>] [<replacement>]] {
+//     header [<matcher>] [[+|-]<field> [<value|regexp>] [<replacement>]] {
 //         [+]<field> [<value|regexp> [<replacement>]]
 //         -<field>
 //     }
-- 
cgit v1.2.3