forked from I2P_Developers/i2p.i2p
Console: Serve default favicon.ico
i2ptunnel: Remove dup link to nonexistent theme favicon.ico
This commit is contained in:
@@ -339,6 +339,7 @@
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.w.tr" value="" />
|
||||
<!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
|
||||
<copy file="../../../installer/resources/themes/console/images/favicon.ico" tofile="../jsp/favicon.ico" />
|
||||
<war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
|
||||
basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
|
||||
<manifest>
|
||||
@@ -678,6 +679,7 @@
|
||||
<delete dir="../jsp/WEB-INF/" />
|
||||
<delete file="../jsp/web-fragment.xml" />
|
||||
<delete file="../jsp/web-out.xml" />
|
||||
<delete file="../jsp/favicon.ico" />
|
||||
</target>
|
||||
<target name="cleandep" depends="clean">
|
||||
</target>
|
||||
|
@@ -61,6 +61,8 @@ public class LocaleWebAppHandler extends HandlerWrapper
|
||||
if (pathInContext.equals("/") || pathInContext.equals("/index.html")) {
|
||||
// home page
|
||||
pathInContext = "/index.jsp";
|
||||
} else if (pathInContext.equals("/favicon.ico")) {
|
||||
// pass thru unchanged
|
||||
} else if (pathInContext.indexOf('/', 1) < 0 &&
|
||||
(!pathInContext.endsWith(".jsp")) &&
|
||||
(!pathInContext.endsWith(".log")) &&
|
||||
|
Reference in New Issue
Block a user