Skip to content

Commit 173c302

Browse files
committed
fix(engineresolver): use NewHTTPTransportWithOptions
By using netxlite.NewHTTPTransportWithOptions: 1. we remove an unnecessary usage of the quirky HTTP transport used for measuring by ./legacy/netx et al (removing such unnecessary usages is ooni/probe#2534); 2. we enable using HTTP/HTTPS proxies in miniooni and ooniprobe. Closes ooni/probe#1955.
1 parent 2edeafa commit 173c302

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

internal/engineresolver/factory.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,14 @@ func newChildResolverHTTPS(
8080
var txp model.HTTPTransport
8181
switch http3Enabled {
8282
case false:
83-
dialer := netxlite.MaybeWrapWithProxyDialer(
84-
netxlite.NewDialerWithStdlibResolver(logger),
85-
proxyURL, // handles correctly the case where proxyURL is nil
86-
)
83+
dialer := netxlite.NewDialerWithStdlibResolver(logger)
8784
thx := netxlite.NewTLSHandshakerStdlib(logger)
8885
tlsDialer := netxlite.NewTLSDialer(dialer, thx)
89-
// TODO(https://github.com/ooni/probe/issues/2534): here we're using the QUIRKY netxlite.NewHTTPTransport
90-
// function, but we can probably avoid using it, given that this code is
91-
// not using tracing and does not care about those quirks.
92-
txp = netxlite.NewHTTPTransport(logger, dialer, tlsDialer)
86+
txp = netxlite.NewHTTPTransportWithOptions(
87+
logger, dialer, tlsDialer,
88+
netxlite.HTTPTransportOptionDisableCompression(false),
89+
netxlite.HTTPTransportOptionProxyURL(proxyURL),
90+
)
9391
case true:
9492
txp = netxlite.NewHTTP3TransportStdlib(logger)
9593
}

0 commit comments

Comments
 (0)