From e30deedcc1490e1fc73b375a0d3147e625aa7472 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 8 Apr 2020 10:43:08 -0600 Subject: caddyhttp: Return port placeholders as ints --- modules/caddyhttp/replacer.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/caddyhttp/replacer.go') diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go index f55bb0a..51fe67f 100644 --- a/modules/caddyhttp/replacer.go +++ b/modules/caddyhttp/replacer.go @@ -85,6 +85,9 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo return host, true case "http.request.port": _, port, _ := net.SplitHostPort(req.Host) + if portNum, err := strconv.Atoi(port); err == nil { + return portNum, true + } return port, true case "http.request.hostport": return req.Host, true @@ -98,6 +101,9 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo return host, true case "http.request.remote.port": _, port, _ := net.SplitHostPort(req.RemoteAddr) + if portNum, err := strconv.Atoi(port); err == nil { + return portNum, true + } return port, true // current URI, including any internal rewrites -- cgit v1.2.3