diff options
| author | Paul Hawke <paul.hawke@gmail.com> | 2013-09-05 08:09:59 -0500 |
|---|---|---|
| committer | Paul Hawke <paul.hawke@gmail.com> | 2013-09-05 08:09:59 -0500 |
| commit | 140479555d9dca01e00bc057764df7a69c94e2c5 (patch) | |
| tree | 38714eeaed933d4a23255df90bd5768224790864 /core/src | |
| parent | d06fedb2c2d8b284e53773b62405f36afcaed461 (diff) | |
| parent | a7a9272e5ecaad16422356a8be7ae46641351ba7 (diff) | |
| download | nanohttpd-140479555d9dca01e00bc057764df7a69c94e2c5.tar.gz | |
Manually merging pull request #49. @psh
Diffstat (limited to 'core/src')
4 files changed, 13 insertions, 5 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index e70d48b..bfe08a5 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -570,11 +570,9 @@ public abstract class NanoHTTPD { } } - int pending = data != null ? data.available() : -1; // This is to support partial sends, see serveFile() - if (pending > 0) { - pw.print("Connection: keep-alive\r\n"); - pw.print("Content-Length: " + pending + "\r\n"); - } + int pending = data != null ? data.available() : 0; // This is to support partial sends, see serveFile() + pw.print("Connection: keep-alive\r\n"); + pw.print("Content-Length: "+pending+"\r\n"); pw.print("\r\n"); pw.flush(); diff --git a/core/src/test/java/fi/iki/elonen/HttpDeleteRequestTest.java b/core/src/test/java/fi/iki/elonen/HttpDeleteRequestTest.java index 6b7dd1a..517ad29 100644 --- a/core/src/test/java/fi/iki/elonen/HttpDeleteRequestTest.java +++ b/core/src/test/java/fi/iki/elonen/HttpDeleteRequestTest.java @@ -20,6 +20,8 @@ public class HttpDeleteRequestTest extends HttpServerTest { "HTTP/1.1 204 No Content", "Content-Type: text/html", "Date: .*", + "Connection: keep-alive", + "Content-Length: 0", "" }; @@ -36,6 +38,8 @@ public class HttpDeleteRequestTest extends HttpServerTest { "HTTP/1.1 204 No Content", "Content-Type: text/html", "Date: .*", + "Connection: keep-alive", + "Content-Length: 0", "" }; @@ -52,6 +56,8 @@ public class HttpDeleteRequestTest extends HttpServerTest { "HTTP/1.1 204 No Content", "Content-Type: text/html", "Date: .*", + "Connection: keep-alive", + "Content-Length: 0", "" }; diff --git a/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java b/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java index 838c8b8..c914249 100644 --- a/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java +++ b/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java @@ -17,6 +17,8 @@ public class HttpGetRequestTest extends HttpServerTest { "HTTP/1.1 200 OK", "Content-Type: text/html", "Date: .*", + "Connection: keep-alive", + "Content-Length: 0", "" }; diff --git a/core/src/test/java/fi/iki/elonen/HttpPutRequestTest.java b/core/src/test/java/fi/iki/elonen/HttpPutRequestTest.java index 6504287..912113e 100644 --- a/core/src/test/java/fi/iki/elonen/HttpPutRequestTest.java +++ b/core/src/test/java/fi/iki/elonen/HttpPutRequestTest.java @@ -19,6 +19,8 @@ public class HttpPutRequestTest extends HttpServerTest { "HTTP/1.1 200 OK", "Content-Type: text/html", "Date: .*", + "Connection: keep-alive", + "Content-Length: 0", "" }; |