git » go-net » commit 8e573f4

diff --git a/http2/transport.go b/http2/transport.go
index 52bc9a3..ad65ab6 100644
--- a/http2/transport.go
+++ b/http2/transport.go
@@ -495,8 +495,17 @@ func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
 func (cc *ClientConn) setGoAway(f *GoAwayFrame) {
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
+
+	old := cc.goAway
 	cc.goAway = f
-	cc.goAwayDebug = string(f.DebugData())
+
+	// Merge the previous and current GoAway error frames.
+	if cc.goAwayDebug == "" {
+		cc.goAwayDebug = string(f.DebugData())
+	}
+	if old != nil && old.ErrCode != ErrCodeNo {
+		cc.goAway.ErrCode = old.ErrCode
+	}
 }
 
 func (cc *ClientConn) CanTakeNewRequest() bool {
diff --git a/http2/transport_test.go b/http2/transport_test.go
index e1274b0..39abde2 100644
--- a/http2/transport_test.go
+++ b/http2/transport_test.go
@@ -2044,7 +2044,7 @@ func testTransportUsesGoAwayDebugError(t *testing.T, failMidBody bool) {
 			res.Body.Close()
 		}
 		want := GoAwayError{
-			LastStreamID: 0,
+			LastStreamID: 5,
 			ErrCode:      goAwayErrCode,
 			DebugData:    goAwayDebugData,
 		}
@@ -2077,7 +2077,10 @@ func testTransportUsesGoAwayDebugError(t *testing.T, failMidBody bool) {
 					BlockFragment: buf.Bytes(),
 				})
 			}
-			ct.fr.WriteGoAway(0, goAwayErrCode, []byte(goAwayDebugData))
+			// Write two GOAWAY frames, to test that the Transport takes
+			// the interesting parts of both.
+			ct.fr.WriteGoAway(5, ErrCodeNo, []byte(goAwayDebugData))
+			ct.fr.WriteGoAway(5, goAwayErrCode, nil)
 			ct.sc.Close()
 			<-clientDone
 			return nil