diff options
| author | Loïc Hoguin <[email protected]> | 2020-11-12 15:27:07 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2020-11-12 15:27:07 +0100 |
| commit | 492c955819eec864e3f3ea2760d3ee7800851356 (patch) | |
| tree | 67046c8bd94cc875b9d0887d721cc3e55ba0950c /test | |
| parent | 093dcd5fdefb6df0d316624665c584f37040cdd8 (diff) | |
| download | gun-492c955819eec864e3f3ea2760d3ee7800851356.tar.gz gun-492c955819eec864e3f3ea2760d3ee7800851356.tar.bz2 gun-492c955819eec864e3f3ea2760d3ee7800851356.zip | |
Return 'undefined' for raw|socks origin_scheme where applicable
Diffstat (limited to 'test')
| -rw-r--r-- | test/raw_SUITE.erl | 10 | ||||
| -rw-r--r-- | test/tunnel_SUITE.erl | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/raw_SUITE.erl b/test/raw_SUITE.erl index fc25f5d..00765ac 100644 --- a/test/raw_SUITE.erl +++ b/test/raw_SUITE.erl @@ -50,7 +50,7 @@ do_direct_raw(OriginTransport) -> #{ transport := OriginTransport, protocol := raw, - origin_scheme := _, %% @todo This should be 'undefined'. + origin_scheme := undefined, origin_host := "localhost", origin_port := OriginPort, intermediaries := [] @@ -98,7 +98,7 @@ do_socks5_raw(OriginTransport, ProxyTransport) -> #{ transport := OriginTransport, protocol := raw, - origin_scheme := _, %% @todo This should be 'undefined'. + origin_scheme := undefined, origin_host := "localhost", origin_port := OriginPort, intermediaries := [#{ @@ -147,7 +147,7 @@ do_connect_raw(OriginTransport, ProxyTransport) -> #{ transport := OriginTransport, protocol := raw, - origin_scheme := _, %% @todo This should be 'undefined'. + origin_scheme := undefined, origin_host := "localhost", origin_port := OriginPort, intermediaries := [#{ @@ -223,7 +223,7 @@ do_http11_upgrade_raw(OriginTransport) -> #{ transport := OriginTransport, protocol := raw, - origin_scheme := _, %% @todo This should be 'undefined'. + origin_scheme := undefined, origin_host := "localhost", origin_port := OriginPort, intermediaries := [] @@ -315,7 +315,7 @@ do_http2_connect_raw(OriginTransport, ProxyScheme, ProxyTransport) -> tunnel := #{ transport := OriginTransport, protocol := raw, - origin_scheme := _, %% @todo This should be 'undefined'. + origin_scheme := undefined, origin_host := "localhost", origin_port := OriginPort } diff --git a/test/tunnel_SUITE.erl b/test/tunnel_SUITE.erl index 24fb813..aaf21a6 100644 --- a/test/tunnel_SUITE.erl +++ b/test/tunnel_SUITE.erl @@ -978,10 +978,10 @@ do_proxy2_stream_info(#st{proxy1=Proxy1, proxy1_port=Proxy1Port, proxy2=Proxy2, _ -> connect end, {OriginTransport, OriginProtocol} = do_type(Origin), - %% @todo The OriginScheme should probably be undefined if Origin is raw|rawtls. - OriginScheme = case OriginTransport of - tcp -> <<"http">>; - tls -> <<"https">> + OriginScheme = case {OriginTransport, OriginProtocol} of + {_, raw} -> undefined; + {tcp, _} -> <<"http">>; + {tls, _} -> <<"https">> end, {ok, #{ ref := StreamRef2, |