Skip to content

Commit 65848d7

Browse files
authored
Merge pull request #85 from netlify/mrdg/handle-client-cancel
Don't treat client cancellation as error
2 parents d57925e + d1354a0 commit 65848d7

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Diff for: api/errors.go

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package api
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"net/http"
78
"os"
@@ -167,6 +168,10 @@ func handleError(err error, w http.ResponseWriter, r *http.Request) {
167168
}
168169

169170
func proxyErrorHandler(w http.ResponseWriter, r *http.Request, err error) {
171+
if err := r.Context().Err(); errors.Is(err, context.Canceled) {
172+
w.WriteHeader(499)
173+
return
174+
}
170175
log := getLogEntry(r)
171176
log.WithError(err).Warn("Failed proxying request")
172177
w.WriteHeader(http.StatusBadGateway)

0 commit comments

Comments
 (0)