Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-23 00:56:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

reverseproxy: Fix round robin data race (#4038)

Browse source
This commit is contained in:
Matthew Holt 2021-02-25 09:41:52 -07:00
parent b54fa41239
commit ce5a0934a8
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/caddyhttp/reverseproxy/reverseproxy.go
View file

@ -368,8 +368,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
reqHost := r.Host reqHost := r.Host
reqHeader := r.Header reqHeader := r.Header
defer func() { defer func() {
r.Host = reqHost r.Host = reqHost // TODO: data race, see #4038
r.Header = reqHeader r.Header = reqHeader // TODO: data race, see #4038
}() }()
start := time.Now() start := time.Now()

4
modules/caddyhttp/reverseproxy/selectionpolicies.go
View file

@ -221,8 +221,8 @@ func (r *RoundRobinSelection) Select(pool UpstreamPool, _ *http.Request, _ http.
return nil return nil
} }
for i := uint32(0); i < n; i++ { for i := uint32(0); i < n; i++ {
atomic.AddUint32(&r.robin, 1) robin := atomic.AddUint32(&r.robin, 1)
host := pool[r.robin%n] host := pool[robin%n]
if host.Available() { if host.Available() {
return host return host
} }