mirror of
https://github.com/dstotijn/hetty.git
synced 2025-07-01 18:47:29 -04:00
Fix missing HTTP/1.0
proto enums
This commit is contained in:
@ -897,8 +897,9 @@ enum HttpMethod {
|
||||
}
|
||||
|
||||
enum HttpProtocol {
|
||||
HTTP1
|
||||
HTTP2
|
||||
HTTP10
|
||||
HTTP11
|
||||
HTTP20
|
||||
}
|
||||
|
||||
scalar Time
|
||||
|
@ -186,18 +186,20 @@ func (e HTTPMethod) MarshalGQL(w io.Writer) {
|
||||
type HTTPProtocol string
|
||||
|
||||
const (
|
||||
HTTPProtocolHTTP1 HTTPProtocol = "HTTP1"
|
||||
HTTPProtocolHTTP2 HTTPProtocol = "HTTP2"
|
||||
HTTPProtocolHTTP10 HTTPProtocol = "HTTP10"
|
||||
HTTPProtocolHTTP11 HTTPProtocol = "HTTP11"
|
||||
HTTPProtocolHTTP20 HTTPProtocol = "HTTP20"
|
||||
)
|
||||
|
||||
var AllHTTPProtocol = []HTTPProtocol{
|
||||
HTTPProtocolHTTP1,
|
||||
HTTPProtocolHTTP2,
|
||||
HTTPProtocolHTTP10,
|
||||
HTTPProtocolHTTP11,
|
||||
HTTPProtocolHTTP20,
|
||||
}
|
||||
|
||||
func (e HTTPProtocol) IsValid() bool {
|
||||
switch e {
|
||||
case HTTPProtocolHTTP1, HTTPProtocolHTTP2:
|
||||
case HTTPProtocolHTTP10, HTTPProtocolHTTP11, HTTPProtocolHTTP20:
|
||||
return true
|
||||
}
|
||||
return false
|
||||
|
@ -22,13 +22,15 @@ import (
|
||||
)
|
||||
|
||||
var httpProtocolMap = map[string]HTTPProtocol{
|
||||
sender.HTTPProto1: HTTPProtocolHTTP1,
|
||||
sender.HTTPProto2: HTTPProtocolHTTP2,
|
||||
sender.HTTPProto10: HTTPProtocolHTTP10,
|
||||
sender.HTTPProto11: HTTPProtocolHTTP11,
|
||||
sender.HTTPProto20: HTTPProtocolHTTP20,
|
||||
}
|
||||
|
||||
var revHTTPProtocolMap = map[HTTPProtocol]string{
|
||||
HTTPProtocolHTTP1: sender.HTTPProto1,
|
||||
HTTPProtocolHTTP2: sender.HTTPProto2,
|
||||
HTTPProtocolHTTP10: sender.HTTPProto10,
|
||||
HTTPProtocolHTTP11: sender.HTTPProto11,
|
||||
HTTPProtocolHTTP20: sender.HTTPProto20,
|
||||
}
|
||||
|
||||
type Resolver struct {
|
||||
|
@ -157,8 +157,9 @@ enum HttpMethod {
|
||||
}
|
||||
|
||||
enum HttpProtocol {
|
||||
HTTP1
|
||||
HTTP2
|
||||
HTTP10
|
||||
HTTP11
|
||||
HTTP20
|
||||
}
|
||||
|
||||
scalar Time
|
||||
|
@ -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,
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user