aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard van Nieuwenhoven <richard.vannieuwenhoven@adesso.at>2015-10-18 08:43:25 +0200
committerRichard van Nieuwenhoven <richard.vannieuwenhoven@adesso.at>2015-10-18 08:43:25 +0200
commit61b7e36938b4a99987e329f94e1e6dfc602ec110 (patch)
treef4c120750a94c9ffc8bad3b030ff9852a1de43f0
parent9f4ed0d87019ed5b7cfd1f7dc845fa949181b6e2 (diff)
parent2080278ba0b8a33cafbd24a7b38ed8a71f8b07b8 (diff)
downloadnanohttpd-61b7e36938b4a99987e329f94e1e6dfc602ec110.tar.gz
Merge pull request #241 from LordFokas/master
Allows WebSocket servers to easily override default HTTP behavior.
-rw-r--r--websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
index 73e5f67..e305d8d 100644
--- a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
+++ b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
@@ -842,9 +842,13 @@ public abstract class NanoWebSocketServer extends NanoHTTPD {
return handshakeResponse;
} else {
- return super.serve(session);
+ return serveHttp(session);
}
}
+
+ protected Response serveHttp(final IHTTPSession session) {
+ return super.serve(session);
+ }
/**
* not all websockets implementations accept gzip compression.