chrissewell/hetty
1
0
Fork 0
mirror of https://github.com/dstotijn/hetty.git synced 2025-07-01 18:47:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing HTTP/1.0 proto enums

Browse Source
This commit is contained in:
David Stotijn
2022-02-27 17:55:41 +01:00
parent c5f76e1f9a
commit 8269af9478
9 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/sender/sender.go
View File

@ -126,7 +126,7 @@ func (svc *service) CreateOrUpdateRequest(ctx context.Context, req Request) (Req
}
if req.Proto == "" {
req.Proto = HTTPProto2
req.Proto = HTTPProto20
}
if !isValidProto(req.Proto) {
@ -157,7 +157,7 @@ func (svc *service) CloneFromRequestLog(ctx context.Context, reqLogID ulid.ULID)
SourceRequestLogID: reqLogID,
Method: reqLog.Method,
URL: reqLog.URL,
Proto: HTTPProto2, // Attempt HTTP/2.
Proto: HTTPProto20, // Attempt HTTP/2.
Header: reqLog.Header,
Body: reqLog.Body,
}

9
pkg/sender/transport.go
View File

@ -12,8 +12,9 @@ type HTTPTransport struct{}
type protoCtxKey struct{}
const (
HTTPProto1 = "HTTP/1.1"
HTTPProto2 = "HTTP/2.0"
HTTPProto10 = "HTTP/1.0"
HTTPProto11 = "HTTP/1.1"
HTTPProto20 = "HTTP/2.0"
)
// h1OnlyTransport mimics `http.DefaultTransport`, but with HTTP/2 disabled.
@ -38,7 +39,7 @@ var h1OnlyTransport = &http.Transport{
func (t *HTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) {
proto, ok := req.Context().Value(protoCtxKey{}).(string)
if ok && proto == HTTPProto1 {
if ok && proto == HTTPProto10 || proto == HTTPProto11 {
return h1OnlyTransport.RoundTrip(req)
}
@ -46,5 +47,5 @@ func (t *HTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) {
}
func isValidProto(proto string) bool {
return proto == HTTPProto1 || proto == HTTPProto2
return proto == HTTPProto10 || proto == HTTPProto11 || proto == HTTPProto20
}