Jonas_Jones/McWebserver
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/McWebserver.git synced 2025-10-22 19:09:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error when 404 file not present

Browse source
This commit is contained in:
J-onasJones 2024-03-11 17:46:53 +01:00
parent 0a71b04b66
commit cc6152f471
1 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/main/java/me/jonasjones/mcwebserver/web/HttpServer.java
View file

@ -359,22 +359,38 @@ public class HttpServer implements Runnable {
} }
private void fileNotFound(PrintWriter out, OutputStream dataOut, String fileRequested) throws IOException { private void fileNotFound(PrintWriter out, OutputStream dataOut, String fileRequested) throws IOException {
Path file = WEB_ROOT.resolve(FILE_NOT_FOUND); try {
int fileLength = (int) Files.size(file); Path file = WEB_ROOT.resolve(FILE_NOT_FOUND);
String contentType = "text/html"; int fileLength = (int) Files.size(file);
byte[] fileData = readFileData(file); String contentType = "text/html";
byte[] fileData = readFileData(file);
dataOut.write(NOT_FOUND); dataOut.write(NOT_FOUND);
dataOut.write(HEADERS); dataOut.write(HEADERS);
dataOut.write("Date: %s\r\n".formatted(Instant.now()).getBytes(StandardCharsets.UTF_8)); dataOut.write("Date: %s\r\n".formatted(Instant.now()).getBytes(StandardCharsets.UTF_8));
dataOut.write("Content-Type: %s\r\n".formatted(contentType).getBytes(StandardCharsets.UTF_8)); dataOut.write("Content-Type: %s\r\n".formatted(contentType).getBytes(StandardCharsets.UTF_8));
dataOut.write("Content-Length: %s\r\n".formatted(fileLength).getBytes(StandardCharsets.UTF_8)); dataOut.write("Content-Length: %s\r\n".formatted(fileLength).getBytes(StandardCharsets.UTF_8));
dataOut.write(CRLF); // blank line between headers and content, very important ! dataOut.write(CRLF); // blank line between headers and content, very important !
out.flush(); // flush character output stream buffer out.flush(); // flush character output stream buffer
dataOut.write(fileData, 0, fileLength); dataOut.write(fileData, 0, fileLength);
dataOut.flush(); dataOut.flush();
VerboseLogger.error("File " + fileRequested + " not found"); VerboseLogger.error("File " + fileRequested + " not found");
} catch (Exception e) {
VerboseLogger.error("Error with file not found exception : " + e.getMessage());
dataOut.write("HTTP/1.1 404 Not Found\r\n".getBytes(StandardCharsets.UTF_8));
dataOut.write("Date: %s\r\n".formatted(Instant.now()).getBytes(StandardCharsets.UTF_8));
dataOut.write("Content-Type: application/json\r\n".getBytes(StandardCharsets.UTF_8));
String jsonString = ErrorHandler.notFoundErrorString();
byte[] jsonBytes = jsonString.getBytes(StandardCharsets.UTF_8);
int contentLength = jsonBytes.length;
dataOut.write(("Content-Length: " + contentLength + "\r\n").getBytes(StandardCharsets.UTF_8));
dataOut.write("\r\n".getBytes(StandardCharsets.UTF_8)); // Blank line before content
dataOut.write(jsonBytes, 0, contentLength);
dataOut.flush();
VerboseLogger.error("File " + fileRequested + " not found");
}
} }
} }