@@ -1266,6 +1266,27 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
12661266 return res , nil
12671267 }
12681268
1269+ cancelRequest := func (cs * clientStream , err error ) error {
1270+ cs .cc .mu .Lock ()
1271+ defer cs .cc .mu .Unlock ()
1272+ cs .abortStreamLocked (err )
1273+ if cs .ID != 0 {
1274+ // This request may have failed because of a problem with the connection,
1275+ // or for some unrelated reason. (For example, the user might have canceled
1276+ // the request without waiting for a response.) Mark the connection as
1277+ // not reusable, since trying to reuse a dead connection is worse than
1278+ // unnecessarily creating a new one.
1279+ //
1280+ // If cs.ID is 0, then the request was never allocated a stream ID and
1281+ // whatever went wrong was unrelated to the connection. We might have
1282+ // timed out waiting for a stream slot when StrictMaxConcurrentStreams
1283+ // is set, for example, in which case retrying on a different connection
1284+ // will not help.
1285+ cs .cc .doNotReuse = true
1286+ }
1287+ return err
1288+ }
1289+
12691290 for {
12701291 select {
12711292 case <- cs .respHeaderRecv :
@@ -1280,15 +1301,12 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
12801301 return handleResponseHeaders ()
12811302 default :
12821303 waitDone ()
1283- return nil , cs .abortErr
1304+ return nil , cancelRequest ( cs , cs .abortErr )
12841305 }
12851306 case <- ctx .Done ():
1286- err := ctx .Err ()
1287- cs .abortStream (err )
1288- return nil , err
1307+ return nil , cancelRequest (cs , ctx .Err ())
12891308 case <- cs .reqCancel :
1290- cs .abortStream (errRequestCanceled )
1291- return nil , errRequestCanceled
1309+ return nil , cancelRequest (cs , errRequestCanceled )
12921310 }
12931311 }
12941312}
0 commit comments