diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java index aad652084..b354792df 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java @@ -15,7 +15,7 @@ import net.i2p.util.Log; import net.i2p.util.PortMapper; import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.handler.gzip.GzipHandler; +import org.eclipse.jetty.servlets.gzip.GzipHandler; /** * Block certain Host headers to prevent DNS rebinding attacks. @@ -44,17 +44,12 @@ public class HostCheckHandler extends GzipHandler _listenHosts = new HashSet(8); setMinGzipSize(32*1024); if (_context.getBooleanPropertyDefaultTrue(PROP_GZIP)) { - addIncludedMimeTypes( - "application/javascript", "application/x-javascript", - "application/xhtml+xml", "application/xml", - "image/svg+xml", - "text/css", "text/html", "text/plain" - ); + setMimeTypes("application/xhtml+xml,application/xml,text/css,text/html,text/plain"); } else { // poorly documented, but we must put something in, // if empty all are matched, // see IncludeExcludeSet - addIncludedMimeTypes("xyzzy"); + setMimeTypes("xyzzy"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 31261e3de..374df3bd2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -1109,8 +1109,8 @@ public class RouterConsoleRunner implements RouterApp { } @Override - public UserIdentity login(String username, Object credentials, ServletRequest request) { - UserIdentity rv = super.login(username, credentials, request); + public UserIdentity login(String username, Object credentials) { + UserIdentity rv = super.login(username, credentials); if (rv == null) //_log.logAlways(net.i2p.util.Log.WARN, "Console authentication failed, webapp: " + _webapp + ", user: " + username); _log.logAlways(net.i2p.util.Log.WARN, "Console authentication failed, user: " + username + " IP: " + request.getRemoteAddr());