diff options
author | Dan Pomeroy <dpomeroy@yext.com> | 2014-08-08 10:50:57 -0400 |
---|---|---|
committer | Dan Pomeroy <dpomeroy@yext.com> | 2014-08-08 11:47:32 -0400 |
commit | 98d6d146214026ab242ce1de320bd7d203d7a5f3 (patch) | |
tree | 6c35fc30b6cd52156bdf7a0874dba1aab2cecfb2 /core/src/main/java | |
parent | ab6feae737b3038532d057e87fd83c58bad3b3cc (diff) | |
download | nanohttpd-98d6d146214026ab242ce1de320bd7d203d7a5f3.tar.gz |
Send amount of data set in content-length
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index ce292a4..e11837a 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -635,7 +635,7 @@ public abstract class NanoHTTPD { sendAsChunked(outputStream, pw); } else { int pending = data != null ? data.available() : 0; - sendContentLengthHeaderIfNotAlreadyPresent(pw, header, pending); + pending = sendContentLengthHeaderIfNotAlreadyPresent(pw, header, pending); pw.print("\r\n"); pw.flush(); sendAsFixedLength(outputStream, pending); @@ -647,10 +647,19 @@ public abstract class NanoHTTPD { } } - protected void sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header, int size) { - if (!headerAlreadySent(header, "content-length")) { - pw.print("Content-Length: "+ size +"\r\n"); + protected int sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header, int size) { + for (String headerName : header.keySet()) { + if (headerName.equalsIgnoreCase("content-length") { + try { + return Integer.parseInt(header.get(headerName)); + } catch (NumberFormatException ex) { + return size; + } + } } + + pw.print("Content-Length: "+ size +"\r\n"); + return size; } protected void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map<String, String> header) { |