serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 22:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

http: Always set status code via response recorder

Browse source 
Fixes panic if no upstream handler wrote anything to the response
This commit is contained in:
Matthew Holt 2020-01-08 18:37:41 -07:00
parent 21f1f95e7b
commit 8bae8f5f5a
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/responsewriter.go
View file

@ -225,6 +225,11 @@ func (rr *responseRecorder) WriteResponse() error {
return nil return nil
} }
CopyHeader(rr.ResponseWriterWrapper.Header(), rr.header) CopyHeader(rr.ResponseWriterWrapper.Header(), rr.header)
if rr.statusCode == 0 {
// could happen if no handlers actually wrote anything,
// and this prevents a panic; status must be > 0
rr.statusCode = http.StatusOK
}
rr.ResponseWriterWrapper.WriteHeader(rr.statusCode) rr.ResponseWriterWrapper.WriteHeader(rr.statusCode)
_, err := io.Copy(rr.ResponseWriterWrapper, rr.buf) _, err := io.Copy(rr.ResponseWriterWrapper, rr.buf)
return err return err