Commit a2741cce authored by David Smith's avatar David Smith Committed by david

Fix html-in-plugins for SparkWeb

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9346 b35dd754-fafc-0310-a699-88a17e54d16e
parent 03739d6c
...@@ -1514,7 +1514,6 @@ ...@@ -1514,7 +1514,6 @@
<exclude name="web/WEB-INF/web.xml"/> <exclude name="web/WEB-INF/web.xml"/>
<exclude name="web/**/*.jsp"/> <exclude name="web/**/*.jsp"/>
<exclude name="web/**/*.jspf"/> <exclude name="web/**/*.jspf"/>
<exclude name="web/**/*.html"/>
<exclude name="java/**/*.java"/> <exclude name="java/**/*.java"/>
</fileset> </fileset>
</copy> </copy>
......
...@@ -331,6 +331,9 @@ public class PluginServlet extends HttpServlet { ...@@ -331,6 +331,9 @@ public class PluginServlet extends HttpServlet {
else if (pathInfo.endsWith(".js")) { else if (pathInfo.endsWith(".js")) {
contentType = "text/javascript"; contentType = "text/javascript";
} }
else if (pathInfo.endsWith(".html") || pathInfo.endsWith(".htm")) {
contentType = "text/html";
}
// setting the content-disposition header breaks IE when downloading CSS // setting the content-disposition header breaks IE when downloading CSS
// response.setHeader("Content-disposition", "filename=\"" + file + "\";"); // response.setHeader("Content-disposition", "filename=\"" + file + "\";");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment