walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

integration: Use []hpack.HeaderField instead of http.Header in requestParam 

With array, we can control the order of header field directly.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-19 21:24:18 +09:00
parent 09939cf6bc
commit 8f45bf7b9e
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration-tests/nghttpx_test.go
View File

@ -3,6 +3,7 @@ package nghttp2
import ( import (
"fmt" "fmt"
"github.com/bradfitz/http2" "github.com/bradfitz/http2"
"github.com/bradfitz/http2/hpack"
"net/http" "net/http"
"testing" "testing"
) )
@ -54,8 +55,8 @@ func TestAddXff2(t *testing.T) {
_, err := st.http2(requestParam{ _, err := st.http2(requestParam{
name: "TestAddXff2", name: "TestAddXff2",
header: http.Header{ header: []hpack.HeaderField{
"x-forwarded-for": []string{"host"}, pair("x-forwarded-for", "host"),
}, },
}) })
if err != nil { if err != nil {
@ -73,8 +74,8 @@ func TestStripXff(t *testing.T) {
_, err := st.http2(requestParam{ _, err := st.http2(requestParam{
name: "TestStripXff1", name: "TestStripXff1",
header: http.Header{ header: []hpack.HeaderField{
"x-forwarded-for": []string{"host"}, pair("x-forwarded-for", "host"),
}, },
}) })
if err != nil { if err != nil {
@ -98,8 +99,8 @@ func TestStripAddXff(t *testing.T) {
_, err := st.http2(requestParam{ _, err := st.http2(requestParam{
name: "TestStripAddXff", name: "TestStripAddXff",
header: http.Header{ header: []hpack.HeaderField{
"x-forwarded-for": []string{"host"}, pair("x-forwarded-for", "host"),
}, },
}) })
if err != nil { if err != nil {
@ -116,8 +117,8 @@ func TestHTTP2BadRequestCL(t *testing.T) {
res, err := st.http2(requestParam{ res, err := st.http2(requestParam{
name: "TestHTTP2BadRequestCL", name: "TestHTTP2BadRequestCL",
method: "POST", method: "POST",
header: http.Header{ header: []hpack.HeaderField{
"content-length": []string{"1024"}, pair("content-length", "1024"),
}, },
body: []byte("foo"), body: []byte("foo"),
}) })

23
integration-tests/server_tester.go
View File

@ -134,15 +134,14 @@ func (st *serverTester) readFrame() (http2.Frame, error) {
} }
type requestParam struct { type requestParam struct {
name string // name for this request to identify the request name string // name for this request to identify the request in log easily
// in log easily streamID uint32 // stream ID, automatically assigned if 0
streamID uint32 // stream ID, automatically assigned if 0 method string // method, defaults to GET
method string // method, defaults to GET scheme string // scheme, defaults to http
scheme string // scheme, defaults to http authority string // authority, defaults to backend server address
authority string // authority, defaults to backend server address path string // path, defaults to /
path string // path, defaults to / header []hpack.HeaderField // additional request header fields
header http.Header // additional request header fields body []byte // request body
body []byte // request body
} }
func (st *serverTester) http2(rp requestParam) (*serverResponse, error) { func (st *serverTester) http2(rp requestParam) (*serverResponse, error) {
@ -195,10 +194,8 @@ func (st *serverTester) http2(rp requestParam) (*serverResponse, error) {
_ = st.enc.WriteField(pair("test-case", rp.name)) _ = st.enc.WriteField(pair("test-case", rp.name))
for k, v := range rp.header { for _, h := range rp.header {
for _, h := range v { _ = st.enc.WriteField(pair(strings.ToLower(h.Name), h.Value))
_ = st.enc.WriteField(pair(strings.ToLower(k), h))
}
} }
err := st.fr.WriteHeaders(http2.HeadersFrameParam{ err := st.fr.WriteHeaders(http2.HeadersFrameParam{