aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/java
diff options
context:
space:
mode:
authorritchie <ritchie@gmx.at>2015-06-14 06:37:11 +0200
committerritchie <ritchie@gmx.at>2015-06-14 06:37:11 +0200
commit367e30264ff0572adbb53483a6a65cdebe406fbc (patch)
tree672c363e6f56731e8e7a8dae7a231aaff8edcf55 /core/src/main/java
parenta29211a348e1c8802c4802ec5b3cb752d505fbb4 (diff)
downloadnanohttpd-367e30264ff0572adbb53483a6a65cdebe406fbc.tar.gz
use ascii encoding to parse the headers, fixes #192
Diffstat (limited to 'core/src/main/java')
-rw-r--r--core/src/main/java/fi/iki/elonen/NanoHTTPD.java5
1 files changed, 3 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 4c3d1d1..468c9fd 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -43,6 +43,7 @@ import java.net.SocketTimeoutException;
import java.net.URLDecoder;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
import java.security.KeyStore;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -573,7 +574,7 @@ public abstract class NanoHTTPD {
int len = (fbuf.remaining() < MAX_HEADER_SIZE) ? fbuf.remaining() : MAX_HEADER_SIZE;
fbuf.get(part_header_buff, 0, len);
ByteArrayInputStream bais = new ByteArrayInputStream(part_header_buff, 0, len);
- BufferedReader in = new BufferedReader(new InputStreamReader(bais));
+ BufferedReader in = new BufferedReader(new InputStreamReader(bais, Charset.forName("US-ASCII")));
// First line is boundary string
String mpline = in.readLine();
@@ -1750,7 +1751,7 @@ public abstract class NanoHTTPD {
* accespts it.
*/
protected boolean useGzipWhenAccepted() {
- return true;
+ return false;
}
public final int getListeningPort() {