From 7f60987afacc2bfad73e133c7e197c8bcaeff711 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 4 Mar 2014 13:36:34 +0000 Subject: [PATCH] Reverse merged HEAD (4.3.0) << factory.setFeature calls in original commit caused a problem when we reverted 60910 on HEAD-BUG-FIX in 62782. 60910 included code to remove the factory.setFeature calls so we don't see the problem on earlier branches which still has this commit. Removing the original commit also removes them and should fix the problem. >> 60525: MNT-10492: Merged HEAD-BUG-FIX (Cloud 33/4.3) to HEAD (Cloud 32) 60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2) 60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8) 60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14) 60520: HOTFIX MNT-10484 - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/webdav/WebDAVMethod.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java index ce77192685..1b45ce0584 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java +++ b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java @@ -534,15 +534,6 @@ public abstract class WebDAVMethod try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setFeature("http://xml.org/sax/features/validation", false); - factory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); - factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); - factory.setFeature("http://xml.org/sax/features/external-general-entities", false); - factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); - factory.setFeature("http://xml.org/sax/features/use-entity-resolver2", false); - factory.setFeature("http://apache.org/xml/features/validation/unparsed-entity-checking", false); - factory.setFeature("http://apache.org/xml/features/validation/dynamic", false); - factory.setFeature("http://apache.org/xml/features/validation/schema/augment-psvi", false); factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder();