geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1214930 - /geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
Date Thu, 15 Dec 2011 19:43:30 GMT
Author: xiaming
Date: Thu Dec 15 19:43:30 2011
New Revision: 1214930

URL: http://svn.apache.org/viewvc?rev=1214930&view=rev
Log:
More changes on instanceManager replacing AnnotationProcessor

Modified:
    geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java

Modified: geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1214930&r1=1214929&r2=1214930&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ geronimo/external/trunk/tomcat-parent-6.0.35/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
Thu Dec 15 19:43:30 2011
@@ -21,7 +21,6 @@ package org.apache.catalina.servlets;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.security.MessageDigest;
@@ -2783,26 +2782,6 @@ public class WebdavServlet
     }
 
 
-    // --------------------------------------------- WebdavResolver Inner Class
-    /**
-     * Work around for XML parsers that don't fully respect
-     * {@link DocumentBuilderFactory#setExpandEntityReferences(false)}. External
-     * references are filtered out for security reasons. See CVE-2007-5461.
-     */
-    private class WebdavResolver implements EntityResolver {
-        private ServletContext context;
-        
-        public WebdavResolver(ServletContext theContext) {
-            context = theContext;
-        }
-     
-        public InputSource resolveEntity (String publicId, String systemId) {
-            context.log(sm.getString("webdavservlet.enternalEntityIgnored",
-                    publicId, systemId));
-            return new InputSource(
-                    new StringReader("Ignored external entity"));
-        }
-    }
 };
 
 



Mime
View raw message