mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipn/localapi: only flush relevant data in multiFilePostResponseWriter.Flush() 

This prevents two things:

1. Crashing if there's no response body
2. Sending a nonsensical 0 response status code

Updates tailscale/corp#22357

Signed-off-by: Percy Wegmann <percy@tailscale.com>
This commit is contained in:
Percy Wegmann 2024-08-14 12:10:57 -05:00 committed by Percy Wegmann
parent a15ff1bade
commit 74b9fa1348
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipn/localapi/localapi.go
View File

@ -1752,10 +1752,17 @@ func (ww *multiFilePostResponseWriter) Write(p []byte) (int, error) {
} }
func (ww *multiFilePostResponseWriter) Flush(w http.ResponseWriter) error { func (ww *multiFilePostResponseWriter) Flush(w http.ResponseWriter) error {
maps.Copy(w.Header(), ww.Header()) if ww.header != nil {
w.WriteHeader(ww.statusCode) maps.Copy(w.Header(), ww.header)
_, err := io.Copy(w, ww.body) }
return err if ww.statusCode > 0 {
w.WriteHeader(ww.statusCode)
}
if ww.body != nil {
_, err := io.Copy(w, ww.body)
return err
}
return nil
} }
func (h *Handler) singleFilePut( func (h *Handler) singleFilePut(