reverseproxy: default to port 80 for port-less upstream dial addresses

caddyserver · Oct 1, 2020 · 40ca4a4 · 40ca4a4
1 parent fdfdc03
commit 40ca4a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/caddytest/integration/reverseproxy_test.go b/caddytest/integration/reverseproxy_test.go
@@ -13,6 +13,19 @@ import (
 	"github.com/caddyserver/caddy/v2/caddytest"
 )
 
+func TestBareUpstream(t *testing.T) {
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+	whoami.domain.me {
+		reverse_proxy whoami
+	}
+	
+	app.domain.me {
+		reverse_proxy app:80
+	}
+	`, "caddyfile")
+}
+
 func TestReverseProxyHealthCheck(t *testing.T) {
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`

diff --git a/modules/caddyhttp/reverseproxy/caddyfile.go b/modules/caddyhttp/reverseproxy/caddyfile.go
@@ -155,6 +155,9 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 			if err != nil {
 				host = upstreamAddr
 			}
+			if port == "" {
+				port = "80"
+			}
 		}
 
 		// the underlying JSON does not yet support different