mirror of
https://tildegit.org/solderpunk/molly-brown
synced 2024-06-10 10:46:09 +02:00
Merge pull request 'Don't include port in REMOTE_ADDR' (#18) from makeworld/molly-brown:master into master
Reviewed-on: https://tildegit.org/solderpunk/molly-brown/pulls/18
This commit is contained in:
commit
2e4a10297e
|
@ -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 {
|
func prepareGatewayVariables(config Config, URL *url.URL, conn net.Conn) map[string]string {
|
||||||
vars := make(map[string]string)
|
vars := make(map[string]string)
|
||||||
vars["QUERY_STRING"] = URL.RawQuery
|
vars["QUERY_STRING"] = URL.RawQuery
|
||||||
vars["REMOTE_ADDR"] = conn.RemoteAddr().String()
|
|
||||||
vars["REQUEST_METHOD"] = ""
|
vars["REQUEST_METHOD"] = ""
|
||||||
vars["SERVER_NAME"] = config.Hostname
|
vars["SERVER_NAME"] = config.Hostname
|
||||||
vars["SERVER_PORT"] = strconv.Itoa(config.Port)
|
vars["SERVER_PORT"] = strconv.Itoa(config.Port)
|
||||||
vars["SERVER_PROTOCOL"] = "GEMINI"
|
vars["SERVER_PROTOCOL"] = "GEMINI"
|
||||||
vars["SERVER_SOFTWARE"] = "MOLLY_BROWN"
|
vars["SERVER_SOFTWARE"] = "MOLLY_BROWN"
|
||||||
|
|
||||||
|
host, _, _ := net.SplitHostPort(conn.RemoteAddr().String())
|
||||||
|
vars["REMOTE_ADDR"] = host
|
||||||
|
|
||||||
// Add TLS variables
|
// Add TLS variables
|
||||||
var tlsConn (*tls.Conn) = conn.(*tls.Conn)
|
var tlsConn (*tls.Conn) = conn.(*tls.Conn)
|
||||||
connState := tlsConn.ConnectionState()
|
connState := tlsConn.ConnectionState()
|
||||||
|
|
Loading…
Reference in New Issue