Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

ResponseBuffer: add missing header writing (#1997)

Browse source 
Signed-off-by: Tw <tw19881113@gmail.com>
This commit is contained in:
Tw 2018-01-16 09:32:19 +08:00 committed by Matt Holt
parent 55a564df6d
commit 1ba5512015
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
caddyhttp/httpserver/recorder.go
View file

@ -115,6 +115,7 @@ type ResponseBuffer struct {
shouldBuffer func(status int, header http.Header) bool shouldBuffer func(status int, header http.Header) bool
stream bool stream bool
rw http.ResponseWriter rw http.ResponseWriter
wroteHeader bool
} }
// NewResponseBuffer returns a new ResponseBuffer that will // NewResponseBuffer returns a new ResponseBuffer that will
@ -152,6 +153,11 @@ func (rb *ResponseBuffer) Header() http.Header {
// upcoming body should be buffered, and then writes // upcoming body should be buffered, and then writes
// the header to the response. // the header to the response.
func (rb *ResponseBuffer) WriteHeader(status int) { func (rb *ResponseBuffer) WriteHeader(status int) {
if rb.wroteHeader {
return
}
rb.wroteHeader = true
rb.status = status rb.status = status
rb.stream = !rb.shouldBuffer(status, rb.header) rb.stream = !rb.shouldBuffer(status, rb.header)
if rb.stream { if rb.stream {
@ -163,6 +169,10 @@ func (rb *ResponseBuffer) WriteHeader(status int) {
// Write writes buf to rb.Buffer if buffering, otherwise // Write writes buf to rb.Buffer if buffering, otherwise
// to the ResponseWriter directly if streaming. // to the ResponseWriter directly if streaming.
func (rb *ResponseBuffer) Write(buf []byte) (int, error) { func (rb *ResponseBuffer) Write(buf []byte) (int, error) {
if !rb.wroteHeader {
rb.WriteHeader(http.StatusOK)
}
if rb.stream { if rb.stream {
return rb.ResponseWriterWrapper.Write(buf) return rb.ResponseWriterWrapper.Write(buf)
} }
@ -190,6 +200,10 @@ func (rb *ResponseBuffer) CopyHeader() {
// from ~8,200 to ~9,600 on templated files by ensuring that this type // from ~8,200 to ~9,600 on templated files by ensuring that this type
// implements io.ReaderFrom. // implements io.ReaderFrom.
func (rb *ResponseBuffer) ReadFrom(src io.Reader) (int64, error) { func (rb *ResponseBuffer) ReadFrom(src io.Reader) (int64, error) {
if !rb.wroteHeader {
rb.WriteHeader(http.StatusOK)
}
if rb.stream { if rb.stream {
// first see if we can avoid any allocations at all // first see if we can avoid any allocations at all
if wt, ok := src.(io.WriterTo); ok { if wt, ok := src.(io.WriterTo); ok {