diff --git a/config/server.go b/config/server.go index 52c5b345..3b41ddc8 100644 --- a/config/server.go +++ b/config/server.go @@ -2,13 +2,21 @@ package config import ( "os" + "strconv" "github.com/imdario/mergo" ) const ( + // DefaultServerHostname returns the default hostname which is 127.0.0.1 + DefaultServerHostname = "127.0.0.1" + // DefaultServerPort returns the default port which is 8080 + DefaultServerPort = 8080 +) + +var ( // DefaultServerAddr the default server addr which is: 127.0.0.1:8080 - DefaultServerAddr = "127.0.0.1:8080" + DefaultServerAddr = DefaultServerHostname + ":" + strconv.Itoa(DefaultServerPort) ) // ServerName the response header of the 'Server' value when writes to the client diff --git a/http.go b/http.go index 6d016101..5fb0c787 100644 --- a/http.go +++ b/http.go @@ -303,6 +303,8 @@ func (s *Server) VirtualHostname() (hostname string) { hostname = s.Config.ListeningAddr if idx := strings.IndexByte(hostname, ':'); idx > 1 { // at least after second char hostname = hostname[0:idx] + } else { + hostname = config.DefaultServerHostname } return } @@ -378,7 +380,7 @@ func (s *Server) Open() error { //check if contains hostname, we need the full host, :8080 should be : 127.0.0.1:8080 if portIdx := strings.IndexByte(a, ':'); portIdx == 0 { // then the : is the first letter, so we dont have setted a hostname, lets set it - s.Config.ListeningAddr = "127.0.0.1" + a + s.Config.ListeningAddr = config.DefaultServerHostname + a } if s.Config.Mode > 0 {