aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorritchie <ritchie@gmx.at>2015-06-04 07:06:57 +0200
committerritchie <ritchie@gmx.at>2015-06-04 07:06:57 +0200
commit8c1502d57d2dddaccc40ab40aa9afa70091704a3 (patch)
tree3448868503e1d375829f4eb4d225991758e99e51 /core
parent4752fb17ef6db086d835297bfd53b67701d6bfa5 (diff)
downloadnanohttpd-8c1502d57d2dddaccc40ab40aa9afa70091704a3.tar.gz
gzip now configuarble and websocket servers turn it default off
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/fi/iki/elonen/NanoHTTPD.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 4073521..1c5bcfd 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -744,7 +744,7 @@ public abstract class NanoHTTPD {
String acceptEncoding = this.headers.get("accept-encoding");
this.cookies.unloadQueue(r);
r.setRequestMethod(this.method);
- r.setGzipEncoding(acceptEncoding != null && acceptEncoding.contains("gzip"));
+ r.setGzipEncoding(useGzipWhenAccepted() && acceptEncoding != null && acceptEncoding.contains("gzip"));
r.setKeepAlive(keepAlive);
r.send(this.outputStream);
}
@@ -1744,6 +1744,14 @@ public abstract class NanoHTTPD {
return decoded;
}
+ /**
+ * @return true if the gzip compression should be used if the client
+ * accespts it.
+ */
+ protected boolean useGzipWhenAccepted() {
+ return true;
+ }
+
public final int getListeningPort() {
return this.myServerSocket == null ? -1 : this.myServerSocket.getLocalPort();
}
@@ -1934,5 +1942,4 @@ public abstract class NanoHTTPD {
public final boolean wasStarted() {
return this.myServerSocket != null && this.myThread != null;
}
-
}