caddy: fix bug with https upstreams (including the patch)

This commit is contained in:
classabbyamp 2022-10-08 13:00:42 -04:00
parent 22b70acfc9
commit b89bb848c7
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From d0556929a4a574ea67be4c1ca2a2741b0f7a52c2 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 27 Sep 2022 21:03:30 +0200
Subject: [PATCH] reverseproxy: fix upstream scheme handling in command (#5088)
e338648fed3263200dfd6abc9f8100c6f1c0eb67 introduced multiple upstream
addresses. A comment notes that mixing schemes isn't supported and
therefore the first valid scheme is supposed to be used.
Fixes setting the first scheme.
fixes #5087
---
modules/caddyhttp/reverseproxy/command.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go
index 481f6e00d4..1b63086159 100644
--- a/modules/caddyhttp/reverseproxy/command.go
+++ b/modules/caddyhttp/reverseproxy/command.go
@@ -117,7 +117,7 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
if err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("invalid upstream address %s: %v", toLoc, err)
}
- if scheme != "" && toScheme != "" {
+ if scheme != "" && toScheme == "" {
toScheme = scheme
}
toAddresses[i] = addr

View File

@ -1,7 +1,7 @@
# Template file for 'caddy'
pkgname=caddy
version=2.6.1
revision=2
revision=3
build_style=go
go_import_path=github.com/caddyserver/caddy/v2
go_package="${go_import_path}/cmd/caddy"