caddyfile: http and https hosts should render in URL format

caddy/caddyfile/json.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"net"
 	"strconv"
 	"strings"
 
@@ -104,6 +105,11 @@ func FromJSON(jsonBytes []byte) ([]byte, error) {
 
 	for _, sb := range j {
 		for i, host := range sb.Hosts {
+			if hostname, port, err := net.SplitHostPort(host); err == nil {
+				if port == "http" || port == "https" {
+					host = port + "://" + hostname
+				}
+			}
 			if i > 0 {
 				result += ", "
 			}

caddy/caddyfile/json_test.go

@@ -59,6 +59,11 @@ baz"
 }`,
 		json: `[{"hosts":["host"],"body":{"dir":["123","4.56","true"]}}]`, // NOTE: I guess we assume numbers and booleans should be encoded as strings...?
 	},
+	{ // 8
+		caddyfile: `http://host, https://host {
+}`,
+		json: `[{"hosts":["host:http","host:https"],"body":{}}]`, // hosts in JSON are always host:port format (if port is specified)
+	},
 }
 
 func TestToJSON(t *testing.T) {