From 98d6d146214026ab242ce1de320bd7d203d7a5f3 Mon Sep 17 00:00:00 2001 From: Dan Pomeroy Date: Fri, 8 Aug 2014 10:50:57 -0400 Subject: Send amount of data set in content-length --- core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'core/src/main/java') 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 header, int size) { - if (!headerAlreadySent(header, "content-length")) { - pw.print("Content-Length: "+ size +"\r\n"); + protected int sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map 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 header) { -- cgit v1.2.3