UPD: Enable Jettys default etags

[gigi.git] / src / org / cacert / gigi / Launcher.java

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index 177d63eed5925b18bed89a27e873990af3ac2d6e..ff4b9b6e7b1aa97ba4f56a8e81155c7e63f15af9 100644 (file)
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -195,6 +195,7 @@ public class Launcher {
 
     private static ContextHandler generateGigiServletContext(ServletHolder webAppServlet) {
         final ResourceHandler rh = new ResourceHandler();
+        rh.setEtags(true);
         rh.setResourceBase("static/www");
 
         HandlerWrapper hw = new PolicyRedirector();
@@ -205,6 +206,7 @@ public class Launcher {
         servlet.addServlet(webAppServlet, "/*");
         ErrorPageErrorHandler epeh = new ErrorPageErrorHandler();
         epeh.addErrorPage(404, "/error");
+        epeh.addErrorPage(403, "/denied");
         servlet.setErrorHandler(epeh);
 
         HandlerList hl = new HandlerList();
@@ -219,6 +221,7 @@ public class Launcher {
 
     private static Handler generateStaticContext() {
         final ResourceHandler rh = new ResourceHandler();
+        rh.setEtags(true);
         rh.setResourceBase("static/static");
 
         ContextHandler ch = new ContextHandler();
@@ -264,6 +267,7 @@ public class Launcher {
         scf.setRenegotiationAllowed(false);
 
         scf.setProtocol("TLS");
+        scf.setIncludeProtocols("TLSv1", "TLSv1.1", "TLSv1.2");
         scf.setTrustStore(conf.getTrustStore());
         KeyStore privateStore = conf.getPrivateStore();
         scf.setKeyStorePassword(conf.getPrivateStorePw());