lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/net/http/HttpResponse.java
View File

@@ -704,8 +704,8 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
final String match = request.getHeader("If-None-Match"); final String match = request.getHeader("If-None-Match");
final String etag = (file == null ? 0L : file.lastModified()) + "-" + length; final String etag = (file == null ? 0L : file.lastModified()) + "-" + length;
if (match != null && etag.equals(match)) { if (match != null && etag.equals(match)) {
finish304(); //finish304();
return; //return;
} }
this.contentLength = length; this.contentLength = length;
if (filename != null && !filename.isEmpty() && file != null) { if (filename != null && !filename.isEmpty() && file != null) {

2
src/org/redkale/net/http/WebSocketServlet.java
View File

@@ -159,7 +159,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
return; return;
} }
webSocket._sessionid = sessionid; webSocket._sessionid = sessionid;
request.setKeepAlive(false); request.setKeepAlive(true);
byte[] bytes = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes(); byte[] bytes = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes();
synchronized (digest) { synchronized (digest) {
bytes = digest.digest(bytes); bytes = digest.digest(bytes);