From b89bb848c7ba4930366533c05e60ccc721439164 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 8 Oct 2022 13:00:42 -0400
Subject: [PATCH] caddy: fix bug with https upstreams (including the patch)

---
 .../caddy/patches/fix_https_upstreams.patch   | 29 +++++++++++++++++++
 srcpkgs/caddy/template                        |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/caddy/patches/fix_https_upstreams.patch

diff --git a/srcpkgs/caddy/patches/fix_https_upstreams.patch b/srcpkgs/caddy/patches/fix_https_upstreams.patch
new file mode 100644
index 00000000000..ccdb599ae35
--- /dev/null
+++ b/srcpkgs/caddy/patches/fix_https_upstreams.patch
@@ -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
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 726c6724de3..7d14b50b734 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -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"