diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 0669950c9fa..84bed5e7a8b 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -502,7 +502,7 @@
jetty.home=${assembly-directory}
jetty.base=${assembly-directory}/demo-base
- --add-to-start=server,continuation,deploy,jsp,ext,resources,client,annotations,jndi
+ --add-to-start=server,continuation,deploy,jsp,ext,resources,client,annotations,jndi,servlets
--add-to-startd-ini=http,https
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java
index 797c25122fa..7966f6f3dcf 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java
@@ -94,7 +94,7 @@ public abstract class BaseHolder extends AbstractLifeCycle implements Dumpabl
{
_class=Loader.loadClass(Holder.class, _className);
if(LOG.isDebugEnabled())
- LOG.debug("Holding {}",_class);
+ LOG.debug("Holding {} from {}",_class,_class.getClassLoader());
}
catch (Exception e)
{
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 165972ff79c..0a57601b4b0 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
@@ -130,7 +130,6 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
"-org.eclipse.jetty.jaas.", // don't hide jaas classes
"-org.eclipse.jetty.servlets.", // don't hide jetty servlets
"-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet
- "-org.eclipse.jetty.servlets.AsyncGzipFilter", // special case for AsyncGzipFilter
"-org.eclipse.jetty.servlet.listener.", // don't hide useful listeners
"-org.eclipse.jetty.websocket.", // don't hide websocket classes from webapps (allow webapp to use ones from system classloader)
"org.eclipse.jetty." // hide other jetty classes