From 43d0488269dbc257529c730cdc3349e48cca1098 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 8 Mar 2017 10:04:48 +1100 Subject: [PATCH 1/2] Issue #1384 Expose StatisticsServlet --- .../src/main/java/org/eclipse/jetty/webapp/WebAppContext.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index eb9c618153b..500ca292b87 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -124,6 +124,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL "org.eclipse.jetty.jaas.", // webapp cannot change jaas classes "org.eclipse.jetty.websocket.", // webapp cannot change / replace websocket classes "org.eclipse.jetty.util.log.", // webapp should use server log + "org.eclipse.jetty.servlet.StatisticsServlet", // webapp cannot change stats servlet "org.eclipse.jetty.servlet.DefaultServlet", // webapp cannot change default servlets "org.eclipse.jetty.jsp.JettyJspServlet", //webapp cannot change jetty jsp servlet "org.eclipse.jetty.servlets.PushCacheFilter", //must be loaded by container classpath @@ -144,6 +145,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL "-org.eclipse.jetty.jndi.", // don't hide naming classes "-org.eclipse.jetty.jaas.", // don't hide jaas classes "-org.eclipse.jetty.servlets.", // don't hide jetty servlets + "-org.eclipse.jetty.servlet.StatisticsServlet", // don't hide stats servlet "-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet "-org.eclipse.jetty.jsp.", //don't hide jsp servlet "-org.eclipse.jetty.servlet.listener.", // don't hide useful listeners From 7ceab7dd5d72e44bc3497da9c52fe01604606651 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 8 Mar 2017 11:28:37 +1100 Subject: [PATCH 2/2] Issue #1379 --- .../java/org/eclipse/jetty/server/session/SessionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index e8984592fac..894aeb3e903 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -90,7 +90,8 @@ public class SessionHandler extends ScopedHandler * Session id path parameter name. * Defaults to jsessionid, but can be set with the * org.eclipse.jetty.servlet.SessionIdPathParameterName context init parameter. - * If set to null or "none" no URL rewriting will be done. + * If context init param is "none", or setSessionIdPathParameterName is called with null or "none", + * no URL rewriting will be done. */ public final static String __SessionIdPathParameterNameProperty = "org.eclipse.jetty.servlet.SessionIdPathParameterName"; public final static String __DefaultSessionIdPathParameterName = "jsessionid";