Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-26 21:02:40 +02:00
Code Issues Projects Releases Wiki Activity

Another attempt to make server conform http.

Browse Source
This commit is contained in:
FrozenCow 2011-04-06 00:54:48 +02:00
parent ad33ef79d9
commit eb276dd59d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/dynmap/web/HttpServerConnection.java
View File

@ -166,7 +166,7 @@ public class HttpServerConnection extends Thread {
} }
HttpResponse response = new HttpResponse(this, out); HttpResponse response = new HttpResponse(this, out);
try { try {
handler.handle(relativePath, request, response); handler.handle(relativePath, request, response);
} catch (IOException e) { } catch (IOException e) {
@ -186,9 +186,11 @@ public class HttpServerConnection extends Thread {
//return; //return;
} }
String connection = response.fields.get("Connection"); boolean isKeepalive = !"close".equals(request.fields.get(HttpField.Connection)) && !"close".equals(response.fields.get(HttpField.Connection));
String contentLength = response.fields.get("Content-Length"); String contentLength = response.fields.get("Content-Length");
if (contentLength == null && connection == null) { if (isKeepalive && contentLength == null) {
// A handler has been a bad boy, but we're here to fix it.
response.fields.put("Content-Length", "0"); response.fields.put("Content-Length", "0");
OutputStream responseBody = response.getBody(); OutputStream responseBody = response.getBody();
@ -201,7 +203,7 @@ public class HttpServerConnection extends Thread {
} }
} }
if (connection != null && connection.equals("close")) { if (!isKeepalive) {
out.flush(); out.flush();
socket.close(); socket.close();
return; return;