From 39c289d649f0fde50880e21b38eadcd6744872e4 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Wed, 16 Aug 2017 17:47:24 -0700
Subject: [PATCH] Allow Docker environment to ignore unknown headers

---
 Dockerfile                                 | 1 +
 src/main/java/org/gaul/s3proxy/Main.java   | 2 +-
 src/main/resources/run-docker-container.sh | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c6e8631..aaf1c84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ ENV \
     S3PROXY_IDENTITY="local-identity" \
     S3PROXY_CREDENTIAL="local-credential" \
     S3PROXY_CORS_ALLOW_ALL="false" \
+    S3PROXY_IGNORE_UNKNOWN_HEADERS="false" \
     JCLOUDS_PROVIDER="filesystem" \
     JCLOUDS_ENDPOINT="" \
     JCLOUDS_REGION="" \
diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java
index 9f7ab59..87ffa0f 100644
--- a/src/main/java/org/gaul/s3proxy/Main.java
+++ b/src/main/java/org/gaul/s3proxy/Main.java
@@ -214,7 +214,7 @@ public final class Main {
                 s3ProxyBuilder.v4MaxNonChunkedRequestSize(Long.parseLong(
                         v4MaxNonChunkedRequestSize));
             }
-            if (ignoreUnknownHeaders != null) {
+            if (!Strings.isNullOrEmpty(ignoreUnknownHeaders)) {
                 s3ProxyBuilder.ignoreUnknownHeaders(Boolean.parseBoolean(
                         ignoreUnknownHeaders));
             }
diff --git a/src/main/resources/run-docker-container.sh b/src/main/resources/run-docker-container.sh
index 4f8051b..394039f 100755
--- a/src/main/resources/run-docker-container.sh
+++ b/src/main/resources/run-docker-container.sh
@@ -8,6 +8,7 @@ exec java \
     -Ds3proxy.identity=${S3PROXY_IDENTITY} \
     -Ds3proxy.credential=${S3PROXY_CREDENTIAL} \
     -Ds3proxy.cors-allow-all=${S3PROXY_CORS_ALLOW_ALL} \
+    -Ds3proxy.ignore-unknown-headers=${S3PROXY_IGNORE_UNKNOWN_HEADERS} \
     -Djclouds.provider=${JCLOUDS_PROVIDER} \
     -Djclouds.identity=${JCLOUDS_IDENTITY} \
     -Djclouds.credential=${JCLOUDS_CREDENTIAL} \