echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Fix gzip enable logic

Browse Source 
Don't compress js
Set charset for war resources
This commit is contained in:
zzz
2018-03-10 14:53:57 +00:00
parent fa85c0c50b
commit fe808a8800
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
View File

@ -377,8 +377,16 @@ class BasicServlet extends HttpServlet
protected void writeHeaders(HttpServletResponse response,HttpContent content,long count) protected void writeHeaders(HttpServletResponse response,HttpContent content,long count)
throws IOException throws IOException
{ {
if (content.getContentType()!=null && response.getContentType()==null) String rtype = response.getContentType();
response.setContentType(content.getContentType()); String ctype = content.getContentType();
if (rtype != null) {
if (rtype.equals("application/javascript"))
response.setCharacterEncoding("ISO-8859-1");
} else if (ctype != null) {
response.setContentType(ctype);
if (ctype.equals("application/javascript"))
response.setCharacterEncoding("ISO-8859-1");
}
response.setHeader("X-Content-Type-Options", "nosniff"); response.setHeader("X-Content-Type-Options", "nosniff");
long lml = content.getLastModified(); long lml = content.getLastModified();
if (lml > 0) if (lml > 0)

15
apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
View File

@ -43,9 +43,18 @@ public class HostCheckHandler extends GzipHandler
_portMapper = ctx.portMapper(); _portMapper = ctx.portMapper();
_listenHosts = new HashSet<String>(8); _listenHosts = new HashSet<String>(8);
setMinGzipSize(64*1024); setMinGzipSize(64*1024);
if (!_context.getBooleanPropertyDefaultTrue(PROP_GZIP)) { if (_context.getBooleanPropertyDefaultTrue(PROP_GZIP)) {
addIncludedMimeTypes("application/x-javascript", "application/xhtml+xml", "application/xml", addIncludedMimeTypes(
"image/svg+xml", "text/css", "text/html", "text/plain"); // our js is very small
//"application/javascript", "application/x-javascript",
"application/xhtml+xml", "application/xml",
"image/svg+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");
} }
} }

3
apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
View File

@ -96,6 +96,9 @@ public class LocaleWebAppHandler extends HandlerWrapper
} }
} }
} }
} else if (pathInContext.startsWith("/js/")) {
// war internal
httpResponse.setCharacterEncoding("ISO-8859-1");
} }
//System.err.println("New path: " + newPath); //System.err.println("New path: " + newPath);
super.handle(newPath, baseRequest, httpRequest, httpResponse); super.handle(newPath, baseRequest, httpRequest, httpResponse);