request.close should close files before cancel

eikenb · eikenb · commit 43ec6c679d35 · 2018-03-19T16:09:31.000-07:00
File reading/writeing might block on close until finished. If the
context's cancel is run first it can cancel the session before that
finishes. So the context's cancel should always be run last.
diff --git a/request.go b/request.go
@@ -152,9 +152,6 @@ func (r *Request) getLister() ListerAt {
 
 // Close reader/writer if possible
 func (r *Request) close() error {
-	if r.cancelCtx != nil {
-		r.cancelCtx()
-	}
 	rd := r.getReader()
 	if c, ok := rd.(io.Closer); ok {
 		return c.Close()
@@ -163,6 +160,9 @@ func (r *Request) close() error {
 	if c, ok := wt.(io.Closer); ok {
 		return c.Close()
 	}
+	if r.cancelCtx != nil {
+		r.cancelCtx()
+	}
 	return nil
 }
 
