aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/java
diff options
context:
space:
mode:
authorritchie <ritchie@gmx.at>2015-05-14 09:11:21 +0200
committerritchie <ritchie@gmx.at>2015-05-14 09:11:21 +0200
commit901af189ee7a1a7a7dc65cd1eb60a107b2faa4a7 (patch)
treefa0a7b0a5985bf21b88cc3274f3a0b7f53afa5ec /core/src/main/java
parent5e2e2f19e06b9f4a01c6da83a2297eb18fe2b546 (diff)
downloadnanohttpd-901af189ee7a1a7a7dc65cd1eb60a107b2faa4a7.tar.gz
timeout now optional
Diffstat (limited to 'core/src/main/java')
-rw-r--r--core/src/main/java/fi/iki/elonen/NanoHTTPD.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index d32ade4..227fa03 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -1320,7 +1320,9 @@ public abstract class NanoHTTPD {
do {
try {
final Socket finalAccept = NanoHTTPD.this.myServerSocket.accept();
- finalAccept.setSoTimeout(this.timeout);
+ if (this.timeout > 0) {
+ finalAccept.setSoTimeout(this.timeout);
+ }
final InputStream inputStream = finalAccept.getInputStream();
NanoHTTPD.this.asyncRunner.exec(createClientHandler(finalAccept, inputStream));
} catch (IOException e) {