From e0e0cf7dd6ba2723260580ac2f88afee847f5613 Mon Sep 17 00:00:00 2001 From: makeworld Date: Sat, 26 Dec 2020 18:23:36 -0500 Subject: [PATCH] Don't include port in REMOTE_ADDR --- dynamic.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dynamic.go b/dynamic.go index 02d38cf..83cb114 100644 --- a/dynamic.go +++ b/dynamic.go @@ -168,13 +168,15 @@ func prepareSCGIVariables(config Config, URL *url.URL, scgiPath string, conn net func prepareGatewayVariables(config Config, URL *url.URL, conn net.Conn) map[string]string { vars := make(map[string]string) vars["QUERY_STRING"] = URL.RawQuery - vars["REMOTE_ADDR"] = conn.RemoteAddr().String() vars["REQUEST_METHOD"] = "" vars["SERVER_NAME"] = config.Hostname vars["SERVER_PORT"] = strconv.Itoa(config.Port) vars["SERVER_PROTOCOL"] = "GEMINI" vars["SERVER_SOFTWARE"] = "MOLLY_BROWN" + host, _, _ := net.SplitHostPort(conn.RemoteAddr().String()) + vars["REMOTE_ADDR"] = host + // Add TLS variables var tlsConn (*tls.Conn) = conn.(*tls.Conn) connState := tlsConn.ConnectionState()