diff options
author | ritchie <ritchie@gmx.at> | 2015-06-14 06:40:38 +0200 |
---|---|---|
committer | ritchie <ritchie@gmx.at> | 2015-06-14 06:40:38 +0200 |
commit | b62c42cafe8449333e3a96c68309a57866f28c09 (patch) | |
tree | 346070d02a1353a3216f0e8eabffe26f0ba3754b /core/src | |
parent | 367e30264ff0572adbb53483a6a65cdebe406fbc (diff) | |
download | nanohttpd-b62c42cafe8449333e3a96c68309a57866f28c09.tar.gz |
default of gzip compression set to false, #196
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 2 | ||||
-rw-r--r-- | core/src/test/java/fi/iki/elonen/integration/GZipIntegrationTest.java | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 468c9fd..aa7df99 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -1748,7 +1748,7 @@ public abstract class NanoHTTPD { /** * @return true if the gzip compression should be used if the client - * accespts it. + * accespts it. Default this option is tuned off. */ protected boolean useGzipWhenAccepted() { return false; diff --git a/core/src/test/java/fi/iki/elonen/integration/GZipIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/GZipIntegrationTest.java index e1d92d7..de38ece 100644 --- a/core/src/test/java/fi/iki/elonen/integration/GZipIntegrationTest.java +++ b/core/src/test/java/fi/iki/elonen/integration/GZipIntegrationTest.java @@ -33,7 +33,17 @@ package fi.iki.elonen.integration; * #L% */ -import fi.iki.elonen.NanoHTTPD; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; @@ -41,10 +51,7 @@ import org.apache.http.impl.client.DecompressingHttpClient; import org.apache.http.util.EntityUtils; import org.junit.Test; -import java.io.*; - -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import fi.iki.elonen.NanoHTTPD; public class GZipIntegrationTest extends IntegrationTestBase<GZipIntegrationTest.TestServer> { @@ -60,6 +67,11 @@ public class GZipIntegrationTest extends IntegrationTestBase<GZipIntegrationTest public Response serve(IHTTPSession session) { return response; } + + @Override + protected boolean useGzipWhenAccepted() { + return true; + } } @Override |