Make CookieProcessor generic using its interface type (it correctly d…

…efaults to the new processor now). git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1731857 13f79535-47bb-0310-9956-ffa450edef68
lopiter · Feb 23, 2016 · 37f39cc · 37f39cc
1 parent 172fe8d
commit 37f39cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/java/org/apache/catalina/storeconfig/StoreRegistry.java b/java/org/apache/catalina/storeconfig/StoreRegistry.java
@@ -43,6 +43,7 @@
 import org.apache.coyote.UpgradeProtocol;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.http.CookieProcessor;
 
 /**
  * Central StoreRegistry for all server.xml elements
@@ -66,7 +67,8 @@ public class StoreRegistry {
             Valve.class, ClusterListener.class, MessageListener.class,
             DataSender.class, ChannelInterceptor.class, Member.class,
             WebResourceRoot.class, WebResourceSet.class,
-            CredentialHandler.class, UpgradeProtocol.class };
+            CredentialHandler.class, UpgradeProtocol.class,
+            CookieProcessor.class };
 
     /**
      * @return Returns the name.

diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -456,16 +456,9 @@
      </Description>
      <Description
         tag="CookieProcessor"
-        standard="true"
-        default="false"
-        tagClass="org.apache.tomcat.util.http.LegacyCookieProcessor"
-        storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
-     </Description>
-     <Description
-        tag="CookieProcessor"
-        standard="true"
+        standard="false"
         default="false"
-        tagClass="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+        tagClass="org.apache.tomcat.util.http.CookieProcessor"
         storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
      </Description>
      <Description