This commit is contained in:
Redkale
2017-07-11 10:09:49 +08:00
parent f9702a9517
commit 8809fe8ec9
2 changed files with 3 additions and 3 deletions

View File

@@ -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) {

View File

@@ -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);