commit 4013f8d559720d4d0087cca0a3f18e0fdf25093d
author apolcyn <apolcyn@google.com> Wed May 10 10:55:38 2017 -0700
committer GitHub <noreply@github.com> Wed May 10 10:55:38 2017 -0700
tree 4213b8b8ac9b1b01beb74ed1a2148b72e74c3bdf
parent ffa4ec7da24e8f4ee690d9aad2afad973e721d7b

tentative fix to a flow control over-give-back bug (#1170)

transport/http2_client.go

diff --git a/transport/http2_client.go b/transport/http2_client.go
index bc202df..736a4b3 100644
--- a/transport/http2_client.go
+++ b/transport/http2_client.go
@@ -802,11 +802,6 @@
 		return
 	}
 	if size > 0 {
-		if f.Header().Flags.Has(http2.FlagDataPadded) {
-			if w := t.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
-				t.controlBuf.put(&windowUpdate{0, w})
-			}
-		}
 		s.mu.Lock()
 		if s.state == streamDone {
 			s.mu.Unlock()
@@ -825,6 +820,9 @@
 			return
 		}
 		if f.Header().Flags.Has(http2.FlagDataPadded) {
+			if w := t.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
+				t.controlBuf.put(&windowUpdate{0, w})
+			}
 			if w := s.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
 				t.controlBuf.put(&windowUpdate{s.id, w})
 			}

transport/http2_server.go

diff --git a/transport/http2_server.go b/transport/http2_server.go
index 4e95036..4f71945 100644
--- a/transport/http2_server.go
+++ b/transport/http2_server.go
@@ -465,11 +465,6 @@
 		return
 	}
 	if size > 0 {
-		if f.Header().Flags.Has(http2.FlagDataPadded) {
-			if w := t.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
-				t.controlBuf.put(&windowUpdate{0, w})
-			}
-		}
 		s.mu.Lock()
 		if s.state == streamDone {
 			s.mu.Unlock()
@@ -486,6 +481,9 @@
 			return
 		}
 		if f.Header().Flags.Has(http2.FlagDataPadded) {
+			if w := t.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
+				t.controlBuf.put(&windowUpdate{0, w})
+			}
 			if w := s.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
 				t.controlBuf.put(&windowUpdate{s.id, w})
 			}