opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #144 from iamqizhao/flow

Browse Source 
send an empty settings frame instead of a default when there is no setting needed.
This commit is contained in:
Qi Zhao
2015-03-31 18:21:43 -07:00
parent 29a23b348e 0e42bae0a0
commit 035401cf33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
transport/http2_client.go
View File

@ -137,11 +137,12 @@ func newHTTP2Client(addr string, opts *DialOptions) (_ ClientTransport, err erro
return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface)) return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
} }
framer := newFramer(conn) framer := newFramer(conn)
var setting http2.Setting
if initialWindowSize != defaultWindowSize { if initialWindowSize != defaultWindowSize {
setting = http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)} err = framer.writeSettings(true, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
} else {
err = framer.writeSettings(true)
} }
if err := framer.writeSettings(true, setting); err != nil { if err != nil {
return nil, ConnectionErrorf("transport: %v", err) return nil, ConnectionErrorf("transport: %v", err)
} }
// Adjust the connection flow control window if needed. // Adjust the connection flow control window if needed.