You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2025/03/20 13:40:11 UTC

(httpcomponents-client) 01/01: HTTPCLIENT-2363: ensure requests have a scheme and an authority populated before they get committed to the execution pipeline

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch HTTPCLIENT-2363
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit d91eeb35ad70f08e72a92103f3d9ba0475d42f6c
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Thu Mar 20 14:35:19 2025 +0100

    HTTPCLIENT-2363: ensure requests have a scheme and an authority populated before they get committed to the execution pipeline
---
 .../http/impl/async/InternalAbstractHttpAsyncClient.java     | 12 ++++++++++--
 .../hc/client5/http/impl/classic/InternalHttpClient.java     | 11 ++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java
index 74bae9c24..f8b02c933 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java
@@ -75,6 +75,7 @@
 import org.apache.hc.core5.http.support.BasicRequestBuilder;
 import org.apache.hc.core5.io.CloseMode;
 import org.apache.hc.core5.io.ModalCloseable;
+import org.apache.hc.core5.net.URIAuthority;
 import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
 import org.apache.hc.core5.util.TimeValue;
 import org.slf4j.Logger;
@@ -193,7 +194,7 @@ private void setupContext(final HttpClientContext context) {
 
     @Override
     protected <T> Future<T> doExecute(
-            final HttpHost httpHost,
+            final HttpHost target,
             final AsyncRequestProducer requestProducer,
             final AsyncResponseConsumer<T> responseConsumer,
             final HandlerFactory<AsyncPushConsumer> pushHandlerFactory,
@@ -217,8 +218,15 @@ protected <T> Future<T> doExecute(
 
                 setupContext(clientContext);
 
+                final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
+                if (request.getScheme() == null) {
+                    request.setScheme(resolvedTarget.getSchemeName());
+                }
+                if (request.getAuthority() == null) {
+                    request.setAuthority(new URIAuthority(resolvedTarget));
+                }
                 final HttpRoute route = determineRoute(
-                        httpHost != null ? httpHost : RoutingSupport.determineHost(request),
+                        resolvedTarget,
                         request,
                         clientContext);
                 final String exchangeId = ExecSupport.getNextExchangeId();
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
index 4215d4285..b762858a9 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
@@ -63,6 +63,7 @@
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.io.CloseMode;
 import org.apache.hc.core5.io.ModalCloseable;
+import org.apache.hc.core5.net.URIAuthority;
 import org.apache.hc.core5.util.Args;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -158,8 +159,16 @@ protected CloseableHttpResponse doExecute(
                 localcontext.setRequestConfig(config);
             }
             setupContext(localcontext);
+
+            final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
+            if (request.getScheme() == null) {
+                request.setScheme(resolvedTarget.getSchemeName());
+            }
+            if (request.getAuthority() == null) {
+                request.setAuthority(new URIAuthority(resolvedTarget));
+            }
             final HttpRoute route = determineRoute(
-                    target != null ? target : RoutingSupport.determineHost(request),
+                    resolvedTarget,
                     request,
                     localcontext);
             final String exchangeId = ExecSupport.getNextExchangeId();