From 350a6631153b0d9142329cbcb8b9f2d12697d314 Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Tue, 15 May 2018 20:51:57 +0000 Subject: [PATCH] Use http.Request.Host only for authority header and not for dialing Signed-off-by: Ivan Markin --- h2quic/request.go | 3 --- h2quic/request_test.go | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/h2quic/request.go b/h2quic/request.go index 911485ef..b27e37e2 100644 --- a/h2quic/request.go +++ b/h2quic/request.go @@ -70,9 +70,6 @@ func requestFromHeaders(headers []hpack.HeaderField) (*http.Request, error) { } func hostnameFromRequest(req *http.Request) string { - if len(req.Host) > 0 { - return req.Host - } if req.URL != nil { return req.URL.Host } diff --git a/h2quic/request_test.go b/h2quic/request_test.go index 6c352e29..55085add 100644 --- a/h2quic/request_test.go +++ b/h2quic/request_test.go @@ -101,16 +101,16 @@ var _ = Describe("Request", func() { Expect(err).ToNot(HaveOccurred()) }) - It("uses req.Host if available", func() { + It("uses req.URL.Host", func() { + req := &http.Request{URL: url} + Expect(hostnameFromRequest(req)).To(Equal("quic.clemente.io:1337")) + }) + + It("uses req.URL.Host even if req.Host is available", func() { req := &http.Request{ Host: "www.example.org", URL: url, } - Expect(hostnameFromRequest(req)).To(Equal("www.example.org")) - }) - - It("uses req.URL.Host if req.Host is not set", func() { - req := &http.Request{URL: url} Expect(hostnameFromRequest(req)).To(Equal("quic.clemente.io:1337")) })