Set host and port on address if specified via flag (fixes #888)

Also fixed a few typos and renamed caddyfile.ServerBlocks() to
caddyfile.Parse().

caddyhttp/httpserver/plugin.go

@@ -82,6 +82,16 @@ func (h *httpContext) InspectServerBlocks(sourceFile string, serverBlocks []cadd
 			if err != nil {
 				return serverBlocks, err
 			}
+
+			// Fill in address components from command line so that middleware
+			// have access to the correct information during setup
+			if addr.Host == "" && Host != DefaultHost {
+				addr.Host = Host
+			}
+			if addr.Port == "" && Port != DefaultPort {
+				addr.Port = Port
+			}
+
 			// Save the config to our master list, and key it for lookups
 			cfg := &SiteConfig{
 				Addr:        addr,
@@ -222,7 +232,9 @@ func (sc *SiteConfig) AddMiddleware(m Middleware) {
 
 // Address represents a site address. It contains
 // the original input value, and the component
-// parts of an address.
+// parts of an address. The component parts may be
+// updated to the correct values as setup proceeds,
+// but the original value should never be changed.
 type Address struct {
 	Original, Scheme, Host, Port, Path string
 }

caddyhttp/httpserver/plugin_test.go

@@ -1,6 +1,11 @@
 package httpserver
 
-import "testing"
+import (
+	"strings"
+	"testing"
+
+	"github.com/mholt/caddy/caddyfile"
+)
 
 func TestStandardizeAddress(t *testing.T) {
 	for i, test := range []struct {
@@ -112,3 +117,22 @@ func TestAddressString(t *testing.T) {
 		}
 	}
 }
+
+func TestInspectServerBlocksWithCustomDefaultPort(t *testing.T) {
+	Port = "9999"
+	filename := "Testfile"
+	ctx := newContext().(*httpContext)
+	input := strings.NewReader(`localhost`)
+	sblocks, err := caddyfile.Parse(filename, input, nil)
+	if err != nil {
+		t.Fatalf("Expected no error setting up test, got: %v", err)
+	}
+	_, err = ctx.InspectServerBlocks(filename, sblocks)
+	if err != nil {
+		t.Fatalf("Didn't expect an error, but got: %v", err)
+	}
+	addr := ctx.keysToSiteConfigs["localhost"].Addr
+	if addr.Port != Port {
+		t.Errorf("Expected the port on the address to be set, but got: %#v", addr)
+	}
+}