From 227664336ef5d68c833fe7d0402ba708cec8f63f Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Sat, 2 Jul 2016 14:10:57 -0600
Subject: [PATCH] Misc. changes: {hostonly} placeholder, self_signed port fix

---
 caddy.go                         | 2 +-
 caddy/build.bash                 | 2 +-
 caddyhttp/httpserver/plugin.go   | 2 +-
 caddyhttp/httpserver/replacer.go | 9 ++++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/caddy.go b/caddy.go
index 568d682f1..d67719d97 100644
--- a/caddy.go
+++ b/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 {
diff --git a/caddy/build.bash b/caddy/build.bash
index 03c553451..f55a98826 100755
--- a/caddy/build.bash
+++ b/caddy/build.bash
@@ -13,7 +13,7 @@
 set -euo pipefail
 
 : ${output_filename:="${1:-}"}
-: ${output_filename:="caddy"}
+: ${output_filename:=""}
 
 : ${git_repo:="${2:-}"}
 : ${git_repo:="."}
diff --git a/caddyhttp/httpserver/plugin.go b/caddyhttp/httpserver/plugin.go
index b983d5d20..3823b8e8c 100644
--- a/caddyhttp/httpserver/plugin.go
+++ b/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.
diff --git a/caddyhttp/httpserver/replacer.go b/caddyhttp/httpserver/replacer.go
index 64cd18013..dea2f7767 100644
--- a/caddyhttp/httpserver/replacer.go
+++ b/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,