aboutsummaryrefslogtreecommitdiff
path: root/webserver/src/main/java/fi/iki/elonen
diff options
context:
space:
mode:
authorPaul Hawke <paul.hawke@gmail.com>2013-06-17 22:34:21 -0500
committerPaul Hawke <paul.hawke@gmail.com>2013-06-17 22:34:21 -0500
commit6b018cee02f3517742880f80c293f5ae0a905b87 (patch)
tree334ab63b027f158415ecb8be3860a3070d681eed /webserver/src/main/java/fi/iki/elonen
parent6f89f6accdd66efc939becfdd6023fa347f4f639 (diff)
downloadnanohttpd-6b018cee02f3517742880f80c293f5ae0a905b87.tar.gz
Added keep-alive support.
Diffstat (limited to 'webserver/src/main/java/fi/iki/elonen')
-rw-r--r--webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
index 5216015..72121e7 100644
--- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -158,10 +158,12 @@ public class SimpleWebServer extends NanoHTTPD {
// Get MIME type from file name extension, if possible
String mime = null;
int dot = f.getCanonicalPath().lastIndexOf('.');
- if (dot >= 0)
+ if (dot >= 0) {
mime = MIME_TYPES.get(f.getCanonicalPath().substring(dot + 1).toLowerCase());
- if (mime == null)
+ }
+ if (mime == null) {
mime = NanoHTTPD.MIME_DEFAULT_BINARY;
+ }
// Calculate etag
String etag = Integer.toHexString((f.getAbsolutePath() + f.lastModified() + "" + f.length()).hashCode());
@@ -192,11 +194,13 @@ public class SimpleWebServer extends NanoHTTPD {
res.addHeader("Content-Range", "bytes 0-0/" + fileLen);
res.addHeader("ETag", etag);
} else {
- if (endAt < 0)
+ if (endAt < 0) {
endAt = fileLen - 1;
+ }
long newLen = endAt - startFrom + 1;
- if (newLen < 0)
+ if (newLen < 0) {
newLen = 0;
+ }
final long dataLen = newLen;
FileInputStream fis = new FileInputStream(f) {
@@ -330,6 +334,7 @@ public class SimpleWebServer extends NanoHTTPD {
public static void main(String[] args) {
// Defaults
int port = 8080;
+
String host = "127.0.0.1";
File wwwroot = new File(".").getAbsoluteFile();
boolean quiet = false;