Fix & make better response

This commit is contained in:
DevSnaith 2023-04-14 02:32:17 +03:00
parent 5e99e9573b
commit d21b1d0320
2 changed files with 13 additions and 3 deletions

Binary file not shown.

View File

@ -2,11 +2,14 @@ package org.eu.lumiere;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import org.eu.lumiere.loggers.GlobalLogger; import org.eu.lumiere.loggers.GlobalLogger;
import org.eu.lumiere.loggers.GlobalLogger.LogLevel; import org.eu.lumiere.loggers.GlobalLogger.LogLevel;
import org.eu.lumiere.net.RequestListener;
import org.eu.lumiere.net.ServerEvents; import org.eu.lumiere.net.ServerEvents;
import org.eu.lumiere.net.WebServer;
import org.eu.lumiere.net.http.HttpRequest; import org.eu.lumiere.net.http.HttpRequest;
import org.eu.lumiere.net.http.HttpRequestHandler; import org.eu.lumiere.net.http.HttpRequestHandler;
import org.eu.lumiere.net.http.HttpResponse; import org.eu.lumiere.net.http.HttpResponse;
@ -16,7 +19,7 @@ public class Lumiere implements ServerEvents{
private GlobalLogger l = GlobalLogger.getLogger(); private GlobalLogger l = GlobalLogger.getLogger();
private int server_port = 8080; private int server_port = 8080;
private WebServer server; private RequestListener server;
private HttpResponse header; private HttpResponse header;
private HttpRequestHandler request; private HttpRequestHandler request;
@ -28,6 +31,7 @@ public class Lumiere implements ServerEvents{
} }
header = new HttpResponse(null, "HTTP/1.1 200 OK", "text/html"); header = new HttpResponse(null, "HTTP/1.1 200 OK", "text/html");
header.setProperty("Server", "Lumiere Server"); header.setProperty("Server", "Lumiere Server");
header.setProperty("Accept-Ranges", "bytes");
} }
@Override @Override
@ -41,7 +45,13 @@ public class Lumiere implements ServerEvents{
httpH.setProperty(key, header.getProperty(key)); httpH.setProperty(key, header.getProperty(key));
}); });
// Add Date to the header
SimpleDateFormat gmtDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z");
gmtDate.setTimeZone(TimeZone.getTimeZone("GMT"));
httpH.setProperty("Date", gmtDate.format(new Date()));
request.onRequestReceived(new HttpRequest(socket), httpH); request.onRequestReceived(new HttpRequest(socket), httpH);
try { try {
if(socket.isConnected()) if(socket.isConnected())
socket.close(); socket.close();
@ -57,7 +67,7 @@ public class Lumiere implements ServerEvents{
} }
server_port = port; server_port = port;
server = new WebServer(this.getClass().getSimpleName(), this, server_port); server = new RequestListener(this.getClass().getSimpleName(), this, server_port);
server.start(); server.start();
} }