From d21b1d03202cf138f503302a41cbc5c7d60ff4c3 Mon Sep 17 00:00:00 2001
From: DevSnaith <65865554+DevSnaith@users.noreply.github.com>
Date: Fri, 14 Apr 2023 02:32:17 +0300
Subject: [PATCH] Fix & make better response

---
 bin/org/eu/lumiere/Lumiere.class | Bin 3892 -> 4371 bytes
 src/org/eu/lumiere/Lumiere.java  |  16 +++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/org/eu/lumiere/Lumiere.class b/bin/org/eu/lumiere/Lumiere.class
index 8aede8b5cc68a63acb804f99e1af569729227b9e..659cca70e13a9a9b077d5049f2ba50a92440face 100644
GIT binary patch
delta 1845
zcmZux`&$%M7=914yR!@f>Y9|Gun0ZEUYsm70_72PQIeGsyg+5Ha9CIOf;)qPT{g9w
zR+gP^cD1tXVkM@FLRwjA+1>6x^wdAle^A*sGmGeBv(IzRnQy<_`+o14BV}Tma`xZh
zlK^Jnw>`=}RwWwQ6@|<BrarD4Eiv8T$-&cGq%t=aG88s;b@5&!xIB`Ka@~y(gLB=0
z!F4gu(c=g+_{24?N^#aP({;0o<!BSk>91I!VkO!bilW?Dm`YMcqkW*4E6}i7MF%=X
z*jeSeRmE*sBepm<mafG*84)VCA+kB5^%=3a*2WDLUFa77IJHa<Ly7g5!TSxZEtcqw
z^F<MZH>J{vh~dV1hSE?d6!3O;d&A+dcYq%6k|lMCM4hgCw<_S+pke|xGEAy&u`<O8
zk=ACUW65ZJ%}O^C4ASCoyMh!p$>?S9jP+919!v1fRFbPmLuV);T%#t2YSEcrlChc|
zHP)LI`&4Yk7V_3F_P#P#|5AUmg8>GI2};HtMBP|*)23i6CYed^R*}Iy46YsvIzyG6
zufk@{^sTSC9HETuBIv62Y{R`K53L1g!Tl;8z=I;{ie`4<VHpoGjI*jHIdPoo+GtMT
z5$q-eF`dSk<Xr~uCYq{iIu-1~V=DHbm;})kPwCX5z>_kbV3=qniKVpW)=<Bxo>(fW
z;we)Q3K19Px*mygf}mS97$%6YTsmEjCJeKEhADRc|2yk?(Id}Z{j!PzsBXMUx@hT3
z#CV!}W4bpIPxDCkfH&QjOwwFsyv8ssm5yq>Pm9}bnhEX_vGcS72?tcXfj7lpa^>}J
z;~g0XN6D~svM?UebrtWL7zzo4t-xiG1i{{qLnftzVzGO!Yd_vsaYXEN54%pNIEfEM
zbN&w3X?!l@j5wD+UHSrN#ozgVvd_ftO3C!E6fk_NVi+UiWPCH;6sX!vOsB1iT$k}9
z!_^{EP$q(kEXnv;tSRWvKLr=^=nAh8e-t!ld`D30S>RceMZ+K&B{b3MgF<U59GFO4
zO@aqg=xr*3D8meR(SQmxV;b5~iN)kuY$wDLvYO8d+=%hi-BLP_13OPac`}$x!U36=
zp_SH&bga$5Nk3q>*~b|;21lTE_|2CrZnC%bA<Pcj$5p<-Fm3^k<Mup^fOmMJLx?R4
zdg8~B%)$tG`hz3b+A)MXv$%^OQCP(YwsrW2up@9B_et<)v2!mfXnXVkO6oEWa+!J<
zm6IJ=JkF#Okh1Wv8l?W#L#I0^a+J(LA+=cz88vXjk8%WXEoNdatsz`T->lgbQA=Nd
z8z`<0{irAX&$H;6Wkb9`&u%=8XQ)CsQW@+;5wSOyzJJf+IV#pqd_RvDh<lU05=idz
zNWfvyw@Zd5(?upGMKL9K5ii+9Qk(WrO~m_7qd14k^U4?`U+Gbl`$n+8!<WVDS-j;V
zr%d?}-aCqYW>^-7$0SfjNP+pZHexasP$MDgw+V9y(L6#jHui=KxEgSjgkz6g0xO|o
z7DKrXHQE`abW*9>Lv+Y9rIw+-P3uxCp=x{N5;7d4Nn1jpkN;S7`N7fXTyX2<!Q=DH
zdyxxnA~Ge4De?!*;(;ta$jLo#t)+Lx(r=JPJmVr@MHhe-;Uj!ZJ`zq@r9Z)^w42?2
dNw%-?9lpmovUten2mFLzh_WhNg<t1S{tvg?qK*In

delta 1334
zcmZ9K=~G)}6vls-o8*$@vIs~^v1Aai5TMbvT4q`^D#c0{P*aQG8t4TAApsI7wOW+A
z@Azu9)}=1BF13~xf`!r1FFNBm<G-MPfy;~^{9--#CQ_#J&b;rr=bq(xo^#Z-^Hsi|
z{$2VO*uvMdzLQ#&`p#WubXmO-YkYF<=YzV6y82!18bS5FyGk`{ruy3z^z1e1pi|Yk
z8>{a!xtmUn!T~GYnoOjvM0($$QOie&eJ1y?UyZqIJ@=Y))1ywfhb!;rL4yZ03WlPS
z(a=OX77s<Nw8=v}tg1aBSFc8m-K=74!b+umL^)t`6}$c1LBGiWgX%Y9pnr(C!LUY=
zQzl`hLy=_Puw7_`goZzs5;O^`FKr#r(CZs|d<-#aGDf+EyDy$h3C0u?25F5_r${Ur
zYVT~D>a#}Ev1GzzQYfCy-=h59&E9DfKW08psGZ(`>!`*xg0ZwTr<67BL+2@zr+G#l
z^VV#Aju#A`{~ujEnivSR#-pi}$&0pF1tL}?HZmHwI-(<jV}_S)j<2XcyxTo9%$mHW
zHu;u3CrsYqUG<mmsOMuoF*v0T`#0#P`Ba_q|Jw7B#?|$E9OzDm&fX#6yRBh=F`xU;
z_|oJpju#o6xgs!<9*-pkoWQR%%y!Xf+<|AM3@&KYsXzT|)Gz)*-C#leZcceG;2}@e
zWS1H(XrG=FOXoJZufr?%T3i&1J|%K0sAL_@a&KfkVX9~+K&wQRXDhISHu;iT+%8!f
zJH;+SyCeyD2AUyrM%=sDEqAHd|KOGeFc_St<wso8bIXLf8||+Qd$P}+i`=+3Yes@i
zOLW0S?#n}5)yqV?8yD$ox`?IIm?3tYfIP|5tnHA1_2;Q+&M>a&-=Jq`?3$CtJLr_f
zPUUz8@d<!h4C=_AW`j_wXA?~lwo!0~B=~wF+#u_@*&!RuB3>ao$U&y0Y(V5VM4?C#
zp^Qg3EDdY{)}ZHKl7FJOC@^G5NqJLclJY2z<%Ce#DNGX<)JJ}xJO{qy@ypPIl?w!d
z%gl5KGd!8$*`Ndk7I|rbBX(AXS1*sRN(jMCa&MKvwaDPM3Bv8-xmiwl)!4!-Ou|en
zQ6oDy9c`VMuk%I@qQI5|Zt2x>PK-QfPdtwER;Qqu4agPLIL4deu?M|6IdJBR<hGUM
zA}OEEF3z(zT+J3&#NN&jwuxo?`J7#Apn%{i5``-y3VDzBB}V6@lk))|%4;M0OnhH(
XmUGzEN+jky^JGMxTG{i(TPpqobr=QY

diff --git a/src/org/eu/lumiere/Lumiere.java b/src/org/eu/lumiere/Lumiere.java
index 97fc3fe..0f42dd2 100644
--- a/src/org/eu/lumiere/Lumiere.java
+++ b/src/org/eu/lumiere/Lumiere.java
@@ -2,11 +2,14 @@ package org.eu.lumiere;
 
 import java.io.IOException;
 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.LogLevel;
+import org.eu.lumiere.net.RequestListener;
 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.HttpRequestHandler;
 import org.eu.lumiere.net.http.HttpResponse;
@@ -16,7 +19,7 @@ public class Lumiere implements ServerEvents{
 	private GlobalLogger l = GlobalLogger.getLogger();
 	
 	private int server_port = 8080;
-	private WebServer server;
+	private RequestListener server;
 	
 	private HttpResponse header;
 	private HttpRequestHandler request;
@@ -28,6 +31,7 @@ public class Lumiere implements ServerEvents{
 		}
 		header = new HttpResponse(null, "HTTP/1.1 200 OK", "text/html");
 		header.setProperty("Server", "Lumiere Server");
+		header.setProperty("Accept-Ranges", "bytes");
 	}
 
 	@Override
@@ -41,7 +45,13 @@ public class Lumiere implements ServerEvents{
 			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);
+		
 		try {			
 			if(socket.isConnected())
 				socket.close();
@@ -57,7 +67,7 @@ public class Lumiere implements ServerEvents{
 		}
 		
 		server_port = port;
-		server = new WebServer(this.getClass().getSimpleName(), this, server_port);
+		server = new RequestListener(this.getClass().getSimpleName(), this, server_port);
 		server.start();
 	}