From 5dec11f2a0e920d5466ff224a0749a667193e3ce Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sat, 8 Jul 2023 13:42:51 -0600 Subject: [PATCH] reverseproxy: Pointer receiver This avoids copying the Upstream, which has an atomically-accessed value in it. --- modules/caddyhttp/reverseproxy/hosts.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/caddyhttp/reverseproxy/hosts.go b/modules/caddyhttp/reverseproxy/hosts.go index 298d4f32..83a39d80 100644 --- a/modules/caddyhttp/reverseproxy/hosts.go +++ b/modules/caddyhttp/reverseproxy/hosts.go @@ -63,9 +63,10 @@ type Upstream struct { unhealthy int32 // accessed atomically; status from active health checker } -func (u Upstream) String() string { - return u.Dial -} +// (pointer receiver necessary to avoid a race condition, since +// copying the Upstream reads the 'unhealthy' field which is +// accessed atomically) +func (u *Upstream) String() string { return u.Dial } // Available returns true if the remote host // is available to receive requests. This is