fix inconsistent handling of IPv6 listen address
1 file changed, 1 insertion(+), 4 deletions(-)
changed files
M internal/server/server.go → internal/server/server.go
@@ -15,9 +15,9 @@ "time" "go.alanpearce.eu/website/internal/builder" cfg "go.alanpearce.eu/website/internal/config" - "go.alanpearce.eu/x/log" "go.alanpearce.eu/website/internal/vcs" "go.alanpearce.eu/website/internal/website" + "go.alanpearce.eu/x/log" "github.com/ardanlabs/conf/v3" "github.com/osdevisnot/sorvor/pkg/livereload"@@ -134,7 +134,6 @@ if runtimeConfig.Development { applyDevModeOverrides(config, runtimeConfig) } - listenAddress := net.JoinHostPort(runtimeConfig.ListenAddress, strconv.Itoa(runtimeConfig.Port)) top := http.NewServeMux() err = rebuild(builderConfig, config, log)@@ -210,7 +209,6 @@ ReadHeaderTimeout: 10 * time.Second, ReadTimeout: 1 * time.Minute, WriteTimeout: 2 * time.Minute, IdleTimeout: 10 * time.Minute, - Addr: listenAddress, Handler: top, }, redirectServer: &http.Server{@@ -218,7 +216,6 @@ ReadHeaderTimeout: 10 * time.Second, ReadTimeout: 1 * time.Minute, WriteTimeout: 2 * time.Minute, IdleTimeout: 10 * time.Minute, - Addr: listenAddress, Handler: rMux, }, log: log,