Be sure to cancel context when Close is called.

eikenb · eikenb · commit f01c3557dc9c · 2018-05-26T13:55:29.000-07:00
When I moved the context below the close calls to fix the issue with
cancel interfering with file finalizing, I didn't take into account
the returns. The context cancel needed to be done regardless which this
does by moving it into a defer.
diff --git a/request.go b/request.go
@@ -152,6 +152,11 @@ func (r *Request) getLister() ListerAt {
 
 // Close reader/writer if possible
 func (r *Request) close() error {
+	defer func() {
+		if r.cancelCtx != nil {
+			r.cancelCtx()
+		}
+	}()
 	rd := r.getReader()
 	if c, ok := rd.(io.Closer); ok {
 		return c.Close()
@@ -160,9 +165,6 @@ func (r *Request) close() error {
 	if c, ok := wt.(io.Closer); ok {
 		return c.Close()
 	}
-	if r.cancelCtx != nil {
-		r.cancelCtx()
-	}
 	return nil
 }
 
