Merge pull request #442 from surevine/of-997

OF-997 Deny framing to avoid clickjacking

src/java/org/jivesoftware/openfire/container/PluginServlet.java

@@ -114,6 +114,8 @@ public class PluginServlet extends HttpServlet {
                 else {
                     handleOtherRequest(pathInfo, response);
                 }
+                // Do not allow framing; OF-997
+                response.addHeader("X-Frame-Options", JiveGlobals.getProperty("adminConsole.frame-options", "deny"));
             }
             catch (Exception e) {
                 Log.error(e.getMessage(), e);