From 8809fe8ec95aa055ccd3ddb1de5d2ec5cff8a355 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Tue, 11 Jul 2017 10:09:49 +0800
Subject: [PATCH]

---
 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 10e78d1fa..d7891149b 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<HttpContext, HttpRequest> {
         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 dc1b98cd2..20cfeb767 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(false);
+            request.setKeepAlive(true);
             byte[] bytes = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes();
             synchronized (digest) {
                 bytes = digest.digest(bytes);