summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/templates
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2022-11-14 11:38:02 -0500
committerGitHub <noreply@github.com>2022-11-14 09:38:02 -0700
commitee7c92ec9b57c671c9091ff993b1a24251020c25 (patch)
treeb9d012e3cbcdf75959b69a7210b762fb48c8b78b /modules/caddyhttp/templates
parent33fdea8f261c306a47b07a6df2c3cb8fe2ad2d5d (diff)
reverseproxy: Mask the WS close message when we're the client (#5199)
* reverseproxy: Mask the WS close message when we're the client * weakrand * Bump golangci-lint version so path ignores work on Windows * gofmt * ugh, gofmt everything, I guess
Diffstat (limited to 'modules/caddyhttp/templates')
-rw-r--r--modules/caddyhttp/templates/caddyfile.go11
-rw-r--r--modules/caddyhttp/templates/templates.go22
2 files changed, 16 insertions, 17 deletions
diff --git a/modules/caddyhttp/templates/caddyfile.go b/modules/caddyhttp/templates/caddyfile.go
index ea6aa9f..06ca3e2 100644
--- a/modules/caddyhttp/templates/caddyfile.go
+++ b/modules/caddyhttp/templates/caddyfile.go
@@ -25,12 +25,11 @@ func init() {
// parseCaddyfile sets up the handler from Caddyfile tokens. Syntax:
//
-// templates [<matcher>] {
-// mime <types...>
-// between <open_delim> <close_delim>
-// root <path>
-// }
-//
+// templates [<matcher>] {
+// mime <types...>
+// between <open_delim> <close_delim>
+// root <path>
+// }
func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
t := new(Templates)
for h.Next() {
diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go
index e32e1c3..449536a 100644
--- a/modules/caddyhttp/templates/templates.go
+++ b/modules/caddyhttp/templates/templates.go
@@ -152,10 +152,10 @@ func init() {
//
// Accesses the current HTTP request, which has various fields, including:
//
-// - `.Method` - the method
-// - `.URL` - the URL, which in turn has component fields (Scheme, Host, Path, etc.)
-// - `.Header` - the header fields
-// - `.Host` - the Host or :authority header of the request
+// - `.Method` - the method
+// - `.URL` - the URL, which in turn has component fields (Scheme, Host, Path, etc.)
+// - `.Header` - the header fields
+// - `.Host` - the Host or :authority header of the request
//
// ```
// {{.Req.Header.Get "User-Agent"}}
@@ -221,15 +221,16 @@ func init() {
// ---
// ```
//
-//
// **JSON** is simply `{` and `}`:
//
// ```
-// {
-// "template": "blog",
-// "title": "Blog Homepage",
-// "sitename": "A Caddy site"
-// }
+//
+// {
+// "template": "blog",
+// "title": "Blog Homepage",
+// "sitename": "A Caddy site"
+// }
+//
// ```
//
// The resulting front matter will be made available like so:
@@ -237,7 +238,6 @@ func init() {
// - `.Meta` to access the metadata fields, for example: `{{$parsed.Meta.title}}`
// - `.Body` to access the body after the front matter, for example: `{{markdown $parsed.Body}}`
//
-//
// ##### `stripHTML`
//
// Removes HTML from a string.