Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Connect executors to update the execution context with the protocol and TLS details upon successful connect

This commit is contained in:
Oleg Kalnichevski 2024-01-15 16:41:59 +01:00
parent 9833c35728
commit 7cf469c5cc
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
View File

@ -34,6 +34,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.hc.client5.http.AuthenticationStrategy;
import org.apache.hc.client5.http.EndpointInfo;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.RouteTracker;
import org.apache.hc.client5.http.SchemePortResolver;
@ -176,11 +177,7 @@ public final class AsyncConnectExec implements AsyncExecChainHandler {
}));
} else {
if (execRuntime.isEndpointConnected()) {
try {
chain.proceed(request, entityProducer, scope, asyncExecCallback);
} catch (final HttpException | IOException ex) {
asyncExecCallback.failed(ex);
}
proceedConnected(request, entityProducer, scope, chain, asyncExecCallback);
} else {
proceedToNextHop(state, request, entityProducer, scope, chain, asyncExecCallback);
}
@ -363,11 +360,7 @@ public final class AsyncConnectExec implements AsyncExecChainHandler {
if (LOG.isDebugEnabled()) {
LOG.debug("{} route fully established", exchangeId);
}
try {
chain.proceed(request, entityProducer, scope, asyncExecCallback);
} catch (final HttpException | IOException ex) {
asyncExecCallback.failed(ex);
}
proceedConnected(request, entityProducer, scope, chain, asyncExecCallback);
break;
default:
@ -543,4 +536,24 @@ public final class AsyncConnectExec implements AsyncExecChainHandler {
return false;
}
private void proceedConnected(
final HttpRequest request,
final AsyncEntityProducer entityProducer,
final AsyncExecChain.Scope scope,
final AsyncExecChain chain,
final AsyncExecCallback asyncExecCallback) {
final AsyncExecRuntime execRuntime = scope.execRuntime;
final HttpClientContext clientContext = scope.clientContext;
final EndpointInfo endpointInfo = execRuntime.getEndpointInfo();
if (endpointInfo != null) {
clientContext.setProtocolVersion(endpointInfo.getProtocol());
clientContext.setAttribute(HttpCoreContext.SSL_SESSION, endpointInfo.getSslSession());
}
try {
chain.proceed(request, entityProducer, scope, asyncExecCallback);
} catch (final HttpException | IOException ex) {
asyncExecCallback.failed(ex);
}
}
}

7
httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
View File

@ -30,6 +30,7 @@ package org.apache.hc.client5.http.impl.classic;
import java.io.IOException;
import org.apache.hc.client5.http.AuthenticationStrategy;
import org.apache.hc.client5.http.EndpointInfo;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.RouteTracker;
import org.apache.hc.client5.http.SchemePortResolver;
@ -62,6 +63,7 @@ import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
import org.slf4j.Logger;
@ -185,6 +187,11 @@ public final class ConnectExec implements ExecChainHandler {
} while (step > HttpRouteDirector.COMPLETE);
}
final EndpointInfo endpointInfo = execRuntime.getEndpointInfo();
if (endpointInfo != null) {
context.setProtocolVersion(endpointInfo.getProtocol());
context.setAttribute(HttpCoreContext.SSL_SESSION, endpointInfo.getSslSession());
}
return chain.proceed(request, scope);
} catch (final IOException | HttpException | RuntimeException ex) {