gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #2166 from juliens/alt-svc

Browse Source 
Fix Alt-Svc header
This commit is contained in:
Marten Seemann
2019-10-14 05:17:25 +07:00
committed by GitHub
parent 81056ebd0d 3c08c885ae
commit 2ef8429ce1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http3/server.go
View File

@@ -334,7 +334,7 @@ func (s *Server) SetQuicHeaders(hdr http.Header) error {
s.supportedVersionsAsString = strings.Join(versions, ",")
}
hdr.Add("Alt-Svc", fmt.Sprintf(`quic=":%d"; ma=2592000; v="%s"`, port, s.supportedVersionsAsString))
hdr.Add("Alt-Svc", fmt.Sprintf(`%s=":%d"; ma=2592000; quic="%s"`, nextProtoH3, port, s.supportedVersionsAsString))
return nil
}

4
http3/server_test.go
View File

@@ -334,12 +334,12 @@ var _ = Describe("Server", func() {
versionsAsString = append(versionsAsString, v.ToAltSvc())
}
return http.Header{
"Alt-Svc": {fmt.Sprintf(`quic=":443"; ma=2592000; v="%s"`, strings.Join(versionsAsString, ","))},
"Alt-Svc": {fmt.Sprintf(`%s=":443"; ma=2592000; quic="%s"`, nextProtoH3, strings.Join(versionsAsString, ","))},
}
}
BeforeEach(func() {
Expect(getExpectedHeader([]protocol.VersionNumber{99, 90, 9})).To(Equal(http.Header{"Alt-Svc": {`quic=":443"; ma=2592000; v="99,90,9"`}}))
Expect(getExpectedHeader([]protocol.VersionNumber{0x00000001, 0x1abadaba})).To(Equal(http.Header{"Alt-Svc": {nextProtoH3 + `=":443"; ma=2592000; quic="1,1abadaba"`}}))
expected = getExpectedHeader(protocol.SupportedVersions)
})

2
internal/protocol/version.go
View File

@@ -50,7 +50,7 @@ func (vn VersionNumber) String() string {
// ToAltSvc returns the representation of the version for the H2 Alt-Svc parameters
func (vn VersionNumber) ToAltSvc() string {
return fmt.Sprintf("%d", vn)
return fmt.Sprintf("%x", uint32(vn))
}
func (vn VersionNumber) isGQUIC() bool {