diff options
| author | Anton Tananaev <anton@traccar.org> | 2023-05-15 15:41:55 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2023-05-15 15:41:55 -0700 |
| commit | d5717272c664b6e09408f31a8448c80a0f380ddb (patch) | |
| tree | a1e4f34b30d33795fb8cc9b92b7802ad1e4707bb /src/main/java/org/traccar/web/WebServer.java | |
| parent | 599abc3523b93f83281d44b109676b1b0ed602f5 (diff) | |
| download | trackermap-server-d5717272c664b6e09408f31a8448c80a0f380ddb.tar.gz trackermap-server-d5717272c664b6e09408f31a8448c80a0f380ddb.tar.bz2 trackermap-server-d5717272c664b6e09408f31a8448c80a0f380ddb.zip | |
Handle modern paths
Diffstat (limited to 'src/main/java/org/traccar/web/WebServer.java')
| -rw-r--r-- | src/main/java/org/traccar/web/WebServer.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index 79d19cc9b..29e6de9f2 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -103,14 +103,8 @@ public class WebServer implements LifecycleObject { @Override protected void handleErrorPage( HttpServletRequest request, Writer writer, int code, String message) throws IOException { - Path index = Paths.get(config.getString(Keys.WEB_PATH), "index.html"); - if (code == HttpStatus.NOT_FOUND_404 - && !request.getPathInfo().startsWith("/api/") && Files.exists(index)) { - writer.write(Files.readString(index)); - } else { - writer.write("<!DOCTYPE><html><head><title>Error</title></head><html><body>" - + code + " - " + HttpStatus.getMessage(code) + "</body></html>"); - } + writer.write("<!DOCTYPE><html><head><title>Error</title></head><html><body>" + + code + " - " + HttpStatus.getMessage(code) + "</body></html>"); } }); @@ -150,7 +144,7 @@ public class WebServer implements LifecycleObject { } private void initWebApp(ServletContextHandler servletHandler) { - ServletHolder servletHolder = new ServletHolder(DefaultServlet.class); + ServletHolder servletHolder = new ServletHolder(ModernDefaultServlet.class); servletHolder.setInitParameter("resourceBase", new File(config.getString(Keys.WEB_PATH)).getAbsolutePath()); servletHolder.setInitParameter("dirAllowed", "false"); if (config.getBoolean(Keys.WEB_DEBUG)) { |