github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-21 19:54:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxy: HTTP status 499 for 'Context canceled' errors (#2297)

Browse Source 
* Adding {when_unix_ms} requests placeholder (unix timestamp with a milliseconds precision)

* Add an 499 HTTP status code on user's cancel request as NGINX doing (instead of 502 Bad Gateway status with 'Context canceled' message)

* 499 HTTP status code was added as constant CustomStatusContextCancelled = 499
This commit is contained in:
Makeev Ivan 2018-11-17 00:52:34 +04:00 committed by Matt Holt
parent 6f580c6aa3
commit 05d0b213a9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddyhttp/proxy/proxy.go
View File

@ -262,6 +262,10 @@ func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
return http.StatusRequestEntityTooLarge, backendErr return http.StatusRequestEntityTooLarge, backendErr
} }
if backendErr == context.Canceled {
return CustomStatusContextCancelled, backendErr
}
// failover; remember this failure for some time if // failover; remember this failure for some time if
// request failure counting is enabled // request failure counting is enabled
timeout := host.FailTimeout timeout := host.FailTimeout
@ -397,3 +401,5 @@ func mutateHeadersByRules(headers, rules http.Header, repl httpserver.Replacer)
} }
} }
} }
const CustomStatusContextCancelled = 499

2
caddyhttp/proxy/proxy_test.go
View File

@ -1369,7 +1369,7 @@ func TestCancelRequest(t *testing.T) {
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
status, err := p.ServeHTTP(rec, req) status, err := p.ServeHTTP(rec, req)
expectedStatus, expectErr := http.StatusBadGateway, context.Canceled expectedStatus, expectErr := CustomStatusContextCancelled, context.Canceled
if status != expectedStatus || err != expectErr { if status != expectedStatus || err != expectErr {
t.Errorf("expect proxy handle return status[%d] with error[%v], but got status[%d] with error[%v]", t.Errorf("expect proxy handle return status[%d] with error[%v], but got status[%d] with error[%v]",
expectedStatus, expectErr, status, err) expectedStatus, expectErr, status, err)