Skip to content

Commit 090ebbd

Browse files
committed
http2: fix Go 1.6 build
We still support Go 1.6 for a few more days. (it'd normally be dropped after Go 1.9 final is out) And maybe we'll need to make a special case for supporting it longer than normal if gRPC needs to. Change-Id: I78675f1ef26aa09436a70d0f8aa3a0958768dd14 Reviewed-on: https://go-review.googlesource.com/53641 Reviewed-by: Brad Fitzpatrick <[email protected]> Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 945ddfd commit 090ebbd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

http2/transport.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Res
354354
select {
355355
case <-time.After(time.Second * time.Duration(backoff)):
356356
continue
357-
case <-req.Context().Done():
358-
return nil, req.Context().Err()
357+
case <-reqContext(req).Done():
358+
return nil, reqContext(req).Err()
359359
}
360360
}
361361
}

0 commit comments

Comments
 (0)