Misc. changes: {hostonly} placeholder, self_signed port fix

caddy.go

@@ -93,7 +93,7 @@ func (i *Instance) Stop() error {
 		}
 	}
 
-	// splice instance list to delete this one
+	// splice i out of instance list, causing it to be garbage-collected
 	instancesMu.Lock()
 	for j, other := range instances {
 		if other == i {

caddy/build.bash

@@ -13,7 +13,7 @@
 set -euo pipefail
 
 : ${output_filename:="${1:-}"}
-: ${output_filename:="caddy"}
+: ${output_filename:=""}
 
 : ${git_repo:="${2:-}"}
 : ${git_repo:="."}

caddyhttp/httpserver/plugin.go

@@ -138,7 +138,7 @@ func (h *httpContext) MakeServers() ([]caddy.Server, error) {
 			// is incorrect for this site.
 			cfg.Addr.Scheme = "https"
 		}
-		if cfg.Addr.Port == "" && (!cfg.TLS.Manual || cfg.TLS.OnDemand) {
+		if cfg.Addr.Port == "" && ((!cfg.TLS.Manual && !cfg.TLS.SelfSigned) || cfg.TLS.OnDemand) {
 			// this is vital, otherwise the function call below that
 			// sets the listener address will use the default port
 			// instead of 443 because it doesn't know about TLS.

caddyhttp/httpserver/replacer.go

@@ -69,7 +69,14 @@ func NewReplacer(r *http.Request, rr *ResponseRecorder, emptyValue string) Repla
 				}
 				return name
 			}(),
-			"{host}":          r.Host,
+			"{host}": r.Host,
+			"{hostonly}": func() string {
+				host, _, err := net.SplitHostPort(r.Host)
+				if err != nil {
+					return r.Host
+				}
+				return host
+			}(),
 			"{path}":          r.URL.Path,
 			"{path_escaped}":  url.QueryEscape(r.URL.Path),
 			"{query}":         r.URL.RawQuery,