mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
caddy: update to 2.6.2.
This commit is contained in:
parent
e4f8bd893f
commit
c486af6717
2 changed files with 3 additions and 32 deletions
|
@ -1,29 +0,0 @@
|
||||||
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
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'caddy'
|
# Template file for 'caddy'
|
||||||
pkgname=caddy
|
pkgname=caddy
|
||||||
version=2.6.1
|
version=2.6.2
|
||||||
revision=3
|
revision=1
|
||||||
build_style=go
|
build_style=go
|
||||||
go_import_path=github.com/caddyserver/caddy/v2
|
go_import_path=github.com/caddyserver/caddy/v2
|
||||||
go_package="${go_import_path}/cmd/caddy"
|
go_package="${go_import_path}/cmd/caddy"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://caddyserver.com"
|
homepage="https://caddyserver.com"
|
||||||
distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
|
distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
|
||||||
checksum=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
|
checksum=563d027a78919f859188fb894ae5f3669508a3430db347aa726cd73c19fb7038
|
||||||
|
|
||||||
system_accounts="caddy"
|
system_accounts="caddy"
|
||||||
caddy_homedir="/var/lib/caddy"
|
caddy_homedir="/var/lib/caddy"
|
||||||
|
|
Loading…
Add table
Reference in a new issue