Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxp
changeset 772:85de91b6e953 jdk8u25-b10
Merge
author | coffeys |
---|---|
date | Mon, 28 Jul 2014 20:27:54 +0100 |
parents | 1c5046638828 (diff) 0bc3e5f6f598 (current diff) |
children | 8412b3a5b678 |
files | .hgtags |
diffstat | 3 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 28 07:23:48 2014 -0700 +++ b/.hgtags Mon Jul 28 20:27:54 2014 +0100 @@ -312,3 +312,12 @@ bf115689d89bb82dc1efbe0348657e993715e850 jdk8u20-b22 d6ded60cfdc53861ae7d1a010f95b5036d610e80 jdk8u20-b23 dd09d8b9edefb5684941941e5d9b35c84ee066f3 jdk8u20-b25 +65e5ee249ebc81c0ccfff23946a0a2a6d4becdcc jdk8u25-b00 +b29277565edfdece4e3928b135d4fd86ae141e4f jdk8u25-b01 +09df5bda467090041090873f71d418eebcadf516 jdk8u25-b02 +f3567e6bed22eaf89c3c7d64e0b1fa308707260f jdk8u25-b03 +a4d0f11cf08d5dae91c5e9ad387b1ff88388503d jdk8u25-b04 +0c4917cea678dc2a3745baca74016f0d6f169012 jdk8u25-b05 +e84d78dd9e0533eb11c26b69727c044898d19f60 jdk8u25-b06 +7aaaec31a0331ad091abedf81c928b47a982222d jdk8u25-b07 +e48a4594f19ad119bc27d89c53dd35d11ed6da7d jdk8u25-b08
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Jul 28 07:23:48 2014 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Jul 28 20:27:54 2014 +0100 @@ -612,9 +612,9 @@ //fElementStack2.clear(); //fReplaceEntityReferences = true; //fSupportExternalEntities = true; - Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_REPLACING_ENTITY_REFERENCES); + Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES); fReplaceEntityReferences = bo.booleanValue(); - bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_SUPPORTING_EXTERNAL_ENTITIES); + bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES); fSupportExternalEntities = bo.booleanValue(); Boolean cdata = (Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT) ; if(cdata != null)
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jul 28 07:23:48 2014 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jul 28 20:27:54 2014 +0100 @@ -53,6 +53,7 @@ import java.util.Map; import java.util.Stack; import javax.xml.XMLConstants; +import javax.xml.stream.XMLInputFactory; /** @@ -305,6 +306,11 @@ /** Property Manager. This is used from Stax */ protected PropertyManager fPropertyManager ; + /** StAX properties */ + boolean fSupportDTD = true; + boolean fReplaceEntityReferences = true; + boolean fSupportExternalEntities = true; + /** used to restrict external access */ protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT; @@ -1136,7 +1142,8 @@ boolean parameter = entityName.startsWith("%"); boolean general = !parameter; if (unparsed || (general && !fExternalGeneralEntities) || - (parameter && !fExternalParameterEntities)) { + (parameter && !fExternalParameterEntities) || + !fSupportDTD || !fSupportExternalEntities) { if (fEntityHandler != null) { fResourceIdentifier.clear(); @@ -1431,6 +1438,10 @@ fStaxEntityResolver = null; } + fSupportDTD = ((Boolean)propertyManager.getProperty(XMLInputFactory.SUPPORT_DTD)).booleanValue(); + fReplaceEntityReferences = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)).booleanValue(); + fSupportExternalEntities = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES)).booleanValue(); + // Zephyr feature ignore-external-dtd is the opposite of Xerces' load-external-dtd fLoadExternalDTD = !((Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.IGNORE_EXTERNAL_DTD)).booleanValue(); @@ -1502,6 +1513,11 @@ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null); entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT); + //StAX Property + fSupportDTD = true; + fReplaceEntityReferences = true; + fSupportExternalEntities = true; + // JAXP 1.5 feature XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null); if (spm == null) {