From da8686c4b974ba0b35f3be5a43b6a2f3a528fed2 Mon Sep 17 00:00:00 2001
From: westwin <westwin@gmail.com>
Date: Wed, 22 Apr 2020 10:34:00 +0800
Subject: [PATCH] reverseproxy: always set req.URL.Host with upstream (#3297)
---
.../caddyhttp/reverseproxy/reverseproxy.go | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go
index 2f871dae3..e322a7400 100644
--- a/modules/caddyhttp/reverseproxy/reverseproxy.go
+++ b/modules/caddyhttp/reverseproxy/reverseproxy.go
@@ -613,19 +613,17 @@ func (lb LoadBalancing) tryAgain(start time.Time, proxyErr error, req *http.Requ
// directRequest modifies only req.URL so that it points to the upstream
// in the given DialInfo. It must modify ONLY the request URL.
func (h Handler) directRequest(req *http.Request, di DialInfo) {
- if req.URL.Host == "" {
- // we need a host, so set the upstream's host address
- reqHost := di.Address
+ // we need a host, so set the upstream's host address
+ reqHost := di.Address
- // if the port equates to the scheme, strip the port because
- // it's weird to make a request like http://example.com:80/.
- if (req.URL.Scheme == "http" && di.Port == "80") ||
- (req.URL.Scheme == "https" && di.Port == "443") {
- reqHost = di.Host
- }
-
- req.URL.Host = reqHost
+ // if the port equates to the scheme, strip the port because
+ // it's weird to make a request like http://example.com:80/.
+ if (req.URL.Scheme == "http" && di.Port == "80") ||
+ (req.URL.Scheme == "https" && di.Port == "443") {
+ reqHost = di.Host
}
+
+ req.URL.Host = reqHost
}
// shouldPanicOnCopyError reports whether the reverse proxy should