Bugzilla 42753

Same fix as 6.0 branch

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@551881 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index 212a173..f0bfef5 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -123,9 +123,13 @@ public final class ApplicationFilterFactory {
         ApplicationFilterChain filterChain = null;
         if (request instanceof Request) {
             Request req = (Request) request;
+            comet = req.isComet();
             if (Globals.IS_SECURITY_ENABLED) {
                 // Security: Do not recycle
                 filterChain = new ApplicationFilterChain();
+                if (comet) {
+                    req.setFilterChain(filterChain);
+                }
             } else {
                 filterChain = (ApplicationFilterChain) req.getFilterChain();
                 if (filterChain == null) {
@@ -133,7 +137,6 @@ public final class ApplicationFilterFactory {
                     req.setFilterChain(filterChain);
                 }
             }
-            comet = req.isComet();
         } else {
             // Request dispatcher in use
             filterChain = new ApplicationFilterChain();