Add HTTP Host header to support Docker v1.12 (#1550)

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
eclipse-che · Jun 23, 2016 · 14e6d4a · 14e6d4a
1 parent db49b31
commit 14e6d4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...r-client/src/main/java/org/eclipse/che/plugin/docker/client/connection/TcpConnection.java b/...r-client/src/main/java/org/eclipse/che/plugin/docker/client/connection/TcpConnection.java
@@ -67,6 +67,12 @@ protected DockerResponse request(String method, String path, String query, List<
         for (Pair<String, ?> header : headers) {
             connection.setRequestProperty(header.first, String.valueOf(header.second));
         }
+        String host = url.getHost();
+        if (url.getPort() != -1) {
+            host += ":" + Integer.toString(url.getPort());
+        }
+        // Host header is mandatory in HTTP 1.1
+        connection.setRequestProperty("Host", host);
         if (entity != null) {
             connection.setDoOutput(true);
             try (OutputStream output = connection.getOutputStream()) {

diff --git a/...t/src/main/java/org/eclipse/che/plugin/docker/client/connection/UnixSocketConnection.java b/...t/src/main/java/org/eclipse/che/plugin/docker/client/connection/UnixSocketConnection.java
@@ -94,7 +94,8 @@ private void writeHttpHeaders(OutputStream output, String method, String path, S
             writer.write(String.valueOf(header.second));
             writer.write("\r\n");
         }
-        writer.write("\r\n");
+        // Host header is mandatory in HTTP 1.1
+        writer.write("Host: \r\n\r\n");
         writer.flush();
     }