Mercurial > hg > openjdk > jdk8 > jaxp

changeset 556:d6d8302ecf8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author chegar
date Fri, 30 Aug 2013 10:15:37 +0100
parents 51bbdd517b93 (current diff) d3be8e3b429d (diff)
children aef8ae2fcec4
files src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 26 21:08:58 2013 -0700
+++ b/.hgtags	Fri Aug 30 10:15:37 2013 +0100
@@ -226,3 +226,4 @@
 7cffafa606e9fb865e7b5e6a56e0a681ce5cf617 jdk8-b102
 b1ceab582fc6d795b20aaa8a3fde2eba34af9399 jdk8-b103
 a22fe9bd01e6c7e7ddc7995dfc9471711692b8d1 jdk8-b104
+09a46ec11f880154886c70be03aff5ab2ddf0ab7 jdk8-b105
--- a/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Mon Aug 26 21:08:58 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Fri Aug 30 10:15:37 2013 +0100
@@ -38,6 +38,7 @@
 import com.sun.org.apache.xerces.internal.util.PropertyState;
 import com.sun.org.apache.xerces.internal.util.Status;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XMLLocator;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -415,6 +416,7 @@
             // REVISIT: What is the right thing to do? -Ac
         }
 
+        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
     } // <init>(SymbolTable,XMLGrammarPool)
 
     //
--- a/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Mon Aug 26 21:08:58 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Fri Aug 30 10:15:37 2013 +0100
@@ -36,6 +36,7 @@
 import com.sun.org.apache.xerces.internal.util.PropertyState;
 import com.sun.org.apache.xerces.internal.util.Status;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XMLLocator;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -376,6 +377,7 @@
             // REVISIT: What is the right thing to do? -Ac
         }
 
+        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
     } // <init>(SymbolTable,XMLGrammarPool)
 
     //