Preserve the protocol in grid when forwarding connections (#2556)

Author: Jason Watt

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -483,7 +483,7 @@ public JsonObject getStatus() throws GridException {
     String url = getRemoteHost().toExternalForm() + "/wd/hub/status";
     BasicHttpRequest r = new BasicHttpRequest("GET", url);
     HttpClient client = getHttpClientFactory().getGridHttpClient(config.nodeStatusCheckTimeout, config.nodeStatusCheckTimeout);
-    HttpHost host = new HttpHost(getRemoteHost().getHost(), getRemoteHost().getPort());
+    HttpHost host = new HttpHost(getRemoteHost().getHost(), getRemoteHost().getPort(), getRemoteHost().getProtocol());
     HttpResponse response;
     String existingName = Thread.currentThread().getName();
     HttpEntity entity = null;

java/server/src/org/openqa/grid/internal/TestSession.java

@@ -362,7 +362,7 @@ private HttpResponse sendRequestToNode(HttpRequest proxyRequest) throws ClientPr
                                                                           IOException {
     HttpClient client = getClient();
     URL remoteURL = slot.getRemoteURL();
-    HttpHost host = new HttpHost(remoteURL.getHost(), remoteURL.getPort());
+    HttpHost host = new HttpHost(remoteURL.getHost(), remoteURL.getPort(), remoteURL.getProtocol());
 
     return client.execute(host, proxyRequest);
   }