diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go index 716faae6ceaa..fd06e7143fa8 100644 --- a/infra/conf/transport_internet.go +++ b/infra/conf/transport_internet.go @@ -314,6 +314,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) { switch c.UplinkDataPlacement { case "": c.UplinkDataPlacement = "body" + case "body": case "cookie", "header": if c.Mode != "packet-up" { return nil, errors.New("UplinkDataPlacement can be " + c.UplinkDataPlacement + " only in packet-up mode") @@ -334,7 +335,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) { switch c.SessionPlacement { case "": c.SessionPlacement = "path" - case "cookie", "header", "query": + case "path", "cookie", "header", "query": default: return nil, errors.New("unsupported session placement: " + c.SessionPlacement) } @@ -342,7 +343,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) { switch c.SeqPlacement { case "": c.SeqPlacement = "path" - case "cookie", "header", "query": + case "path", "cookie", "header", "query": if c.SessionPlacement == "path" { return nil, errors.New("SeqPlacement must be path when SessionPlacement is path") } diff --git a/transport/internet/splithttp/dialer.go b/transport/internet/splithttp/dialer.go index d85198180b86..4d02a67169c2 100644 --- a/transport/internet/splithttp/dialer.go +++ b/transport/internet/splithttp/dialer.go @@ -272,11 +272,6 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me requestURL.Host = dest.Address.String() } - sessionId := "" - if transportConfiguration.Mode != "stream-one" { - sessionIdUuid := uuid.New() - sessionId = sessionIdUuid.String() - } requestURL.Path = transportConfiguration.GetNormalizedPath() requestURL.RawQuery = transportConfiguration.GetNormalizedQuery() @@ -293,6 +288,12 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me } } + sessionId := "" + if mode != "stream-one" { + sessionIdUuid := uuid.New() + sessionId = sessionIdUuid.String() + } + errors.LogInfo(ctx, fmt.Sprintf("XHTTP is dialing to %s, mode %s, HTTP version %s, host %s", dest, mode, httpVersion, requestURL.Host)) requestURL2 := requestURL