diff options
| author | Nikolay Vlahovski <nvlahovski@gmail.com> | 2023-05-18 09:35:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 09:35:27 +0300 |
| commit | adbe25e9daa125e989c853068bc600c61234c342 (patch) | |
| tree | bcba9f4c91ed6dbb5dc29a275fe24c063c1c145b /src/main/java/org/traccar/web/WebServer.java | |
| parent | 074dc016d21f9848140d125c2812d8abf25e8d53 (diff) | |
| parent | fbd3ee0d77673d94766a87aa67c05885e44aa7e5 (diff) | |
| download | trackermap-server-adbe25e9daa125e989c853068bc600c61234c342.tar.gz trackermap-server-adbe25e9daa125e989c853068bc600c61234c342.tar.bz2 trackermap-server-adbe25e9daa125e989c853068bc600c61234c342.zip | |
Merge branch 'traccar:master' into master
Diffstat (limited to 'src/main/java/org/traccar/web/WebServer.java')
| -rw-r--r-- | src/main/java/org/traccar/web/WebServer.java | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index 79d19cc9b..ce1220157 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -62,9 +62,6 @@ import java.io.File; import java.io.IOException; import java.io.Writer; import java.net.InetSocketAddress; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.EnumSet; public class WebServer implements LifecycleObject { @@ -103,14 +100,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 +141,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)) { |