aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/http2_interop/settings.go
diff options
context:
space:
mode:
authorGravatar Carl Mastrangelo <notcarl@google.com>2015-12-01 16:19:23 -0800
committerGravatar Carl Mastrangelo <notcarl@google.com>2015-12-03 12:37:30 -0800
commit368a304c940e5379935aa828f3f30d17d7a29fbb (patch)
treebcc439679d6660c0026589f4251269615832540b /tools/http2_interop/settings.go
parentf7abb65c37bb114bc73e54bf46b11066a29f545b (diff)
Add http2 test for small http max frame size
Diffstat (limited to 'tools/http2_interop/settings.go')
-rw-r--r--tools/http2_interop/settings.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/http2_interop/settings.go b/tools/http2_interop/settings.go
index 5a2b1ada65..97914d960f 100644
--- a/tools/http2_interop/settings.go
+++ b/tools/http2_interop/settings.go
@@ -29,19 +29,19 @@ const (
func (si SettingsIdentifier) String() string {
switch si {
case SettingsHeaderTableSize:
- return "HEADER_TABLE_SIZE"
+ return "SETTINGS_HEADER_TABLE_SIZE"
case SettingsEnablePush:
- return "ENABLE_PUSH"
+ return "SETTINGS_ENABLE_PUSH"
case SettingsMaxConcurrentStreams:
- return "MAX_CONCURRENT_STREAMS"
+ return "SETTINGS_MAX_CONCURRENT_STREAMS"
case SettingsInitialWindowSize:
- return "INITIAL_WINDOW_SIZE"
+ return "SETTINGS_INITIAL_WINDOW_SIZE"
case SettingsMaxFrameSize:
- return "MAX_FRAME_SIZE"
+ return "SETTINGS_MAX_FRAME_SIZE"
case SettingsMaxHeaderListSize:
- return "MAX_HEADER_LIST_SIZE"
+ return "SETTINGS_MAX_HEADER_LIST_SIZE"
default:
- return fmt.Sprintf("UNKNOWN(%d)", uint16(si))
+ return fmt.Sprintf("SETTINGS_UNKNOWN(%d)", uint16(si))
}
}
@@ -82,7 +82,7 @@ func (f *SettingsFrame) UnmarshalPayload(raw []byte) error {
}
func (f *SettingsFrame) MarshalPayload() ([]byte, error) {
- raw := make([]byte, 0, len(f.Params)*6)
+ raw := make([]byte, len(f.Params)*6)
for i, p := range f.Params {
binary.BigEndian.PutUint16(raw[i*6:i*6+2], uint16(p.Identifier))
binary.BigEndian.PutUint32(raw[i*6+2:i*6+6], p.Value)
@@ -102,7 +102,6 @@ func (f *SettingsFrame) MarshalBinary() ([]byte, error) {
if err != nil {
return nil, err
}
-
header = append(header, payload...)
return header, nil