HTTPCLIENT-2363: ensure requests have a scheme and an authority populated before they get committed to the execution pipeline

Author: ok2c

Diff for: 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 for: 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();