Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,6 @@ private <T> void connectWithAddresses(Request request, ProxyServer proxy, NettyR
private <T> Future<List<InetSocketAddress>> resolveAddresses(Request request, ProxyServer proxy, NettyResponseFuture<T> future,
AsyncHandler<T> asyncHandler, boolean scheduleTimeout) {
Uri uri = request.getUri();
final Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();

if (proxy != null && !proxy.isIgnoredForHost(uri.getHost()) && proxy.getProxyType().isHttp()) {
int port = ProxyType.HTTPS.equals(proxy.getProxyType()) || uri.isSecured() ? proxy.getSecuredPort() : proxy.getPort();
Expand All @@ -584,6 +583,7 @@ private <T> Future<List<InetSocketAddress>> resolveAddresses(Request request, Pr
if (request.getAddress() != null) {
// bypass resolution
InetSocketAddress inetSocketAddress = new InetSocketAddress(request.getAddress(), port);
Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
return promise.setSuccess(singletonList(inetSocketAddress));
}
return resolveHostname(request, unresolvedRemoteAddress, asyncHandler);
Expand Down
Loading