From f9702a951758981e5f85abf85f6e38100b547659 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Tue, 11 Jul 2017 10:07:42 +0800 Subject: [PATCH] =?UTF-8?q?WebSocket=E6=97=B6request.keepAlive=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/redkale/net/http/HttpResponse.java | 4 ++-- src/org/redkale/net/http/WebSocketServlet.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java index d7891149b..10e78d1fa 100644 --- a/src/org/redkale/net/http/HttpResponse.java +++ b/src/org/redkale/net/http/HttpResponse.java @@ -704,8 +704,8 @@ public class HttpResponse extends Response { final String match = request.getHeader("If-None-Match"); final String etag = (file == null ? 0L : file.lastModified()) + "-" + length; if (match != null && etag.equals(match)) { - //finish304(); - //return; + finish304(); + return; } this.contentLength = length; if (filename != null && !filename.isEmpty() && file != null) { diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java index 20cfeb767..dc1b98cd2 100644 --- a/src/org/redkale/net/http/WebSocketServlet.java +++ b/src/org/redkale/net/http/WebSocketServlet.java @@ -159,7 +159,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl return; } webSocket._sessionid = sessionid; - request.setKeepAlive(true); + request.setKeepAlive(false); byte[] bytes = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes(); synchronized (digest) { bytes = digest.digest(bytes);