# HG changeset patch
# User asaha
# Date 1409263449 25200
# Node ID 90b8e5b32e583feda7e058d586a612883946acd4
# Parent  498ddd5ee22ce95b2ef3276a12c3adcbfe4317ae# Parent  0cce3514fa1876276de1c8c1dfc3d2573e7c2f09
Merge

diff -r 498ddd5ee22c -r 90b8e5b32e58 .hgtags
--- a/.hgtags	Wed Aug 20 12:12:57 2014 -0700
+++ b/.hgtags	Thu Aug 28 15:04:09 2014 -0700
@@ -425,6 +425,9 @@
 5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
 94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32
 476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33
+32aa4a5892b0567b19da2bc5b72aa3f3a3398130 jdk7u55-b34
+1f8449a6e05ee0a495ba89c3b4021b46f641ff40 jdk7u55-b35
+7767e8740aea3283703e634ffdbfccd0fbebe82d jdk7u55-b36
 d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
 ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
 050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
@@ -446,6 +449,10 @@
 ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18
 dd5a398eedc7031a4fb8682bc423e787db465c9e jdk7u65-b01
 581752d32aebea959fec84e8ae692e1f63d2c4a8 jdk7u60-b19
+cef2dec8b5d76555c5b7b2e1a62275206f76a07a jdk7u60-b30
+bfa8403a1e28bdc1e94ba61d89e170e4ccc7d58b jdk7u60-b31
+33a8a292a02aa76139d0d04970a0d87cc674f2e3 jdk7u60-b32
+583c5eeb9f31275121aecca60307b8885a1a80d0 jdk7u60-b33
 27909f138bdb9ffdd2ab4bded231c7ccc2264046 jdk7u65-b02
 b3307181bd0f1a2c6e1e2c403b87a76e34452110 jdk7u65-b03
 efa9425faaf402b7ea9c6226eb08236d8fa1ff2b jdk7u65-b04
@@ -466,6 +473,45 @@
 45db678253587755df4a00066e42e2fce04bbb71 jdk7u65-b18
 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b19
 f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
+d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
+d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
+4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
+a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
+f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
+86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
+d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
+19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
+533ecae83034da1e68ee9a414b690c9b6eead293 jdk7u66-b10
+763f80d4aae130a89efa4c6544ee98fcb7e6a2ca jdk7u66-b11
+0d91d2f038d19261e0085a76bb8974c3b7609c5d jdk7u66-b12
+cddc3774bebfe597228c7b3e386859b1fa775387 jdk7u66-b13
+15206a7046a97d0a0fd824bec8b0e4174a56d8eb jdk7u66-b14
+af60b8e3b9deb32d50552916e0afd38a30feaef0 jdk7u66-b15
+36bba6c72f866df5c65ba8678544bf0442a952b3 jdk7u66-b16
+9a777cc0d6b3b25d13feca1e610584d042565367 jdk7u66-b17
+174a2f822f4f600f798e9963f0c1496206dce471 jdk7u71-b00
+df8d93eddfc2de1046b8fb87204bc945c538a282 jdk7u71-b01
+153724c929075f0a741aacead679af39f03a0a80 jdk7u71-b02
+9e2007e23f356b7bc5d4d0c6c6350e9b3b3cd56b jdk7u71-b03
+f58a7f8db6c54cd76621d1f48d17102ffbe93983 jdk7u71-b04
+edab7f6d9a30feea45bf9185de0c65e11ab3a7b0 jdk7u71-b05
+ca2992ad734eaf8295e21351b0de329555e9e60a jdk7u71-b06
+5fbecd4c30c2e566e9b815818d51042e20d3ab83 jdk7u71-b07
+acf176ea76f904674228745c25af195e460f1240 jdk7u71-b08
+8a9f55d8d011ad6dc36f307dfac47981b676b379 jdk7u71-b09
+d82fd2f6c5c8ed03c75828033058b675f9239d4b jdk7u71-b10
+f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
+0e7c12377e0120b908fc594afc596ce1f5f2b234 jdk7u72-b01
+bc5b33e920af4b34facfa85a6bf48d5f55b05116 jdk7u72-b02
+b1f6b12c1fcac4b0ea89bf3f134324aa8968b847 jdk7u72-b03
+f59d0ae0995d2cdb57ea482a8fa47575e0d8b57f jdk7u72-b04
+ed071d27bf7320265d8ae527bb622f2e26e1a89c jdk7u72-b05
+d3c5c35f617e33f673420ff9da8051c742513af3 jdk7u72-b06
+ef0842fc31d98031ad9bb514b0f8d2db7bcf4162 jdk7u72-b07
+89117e4403e61b9c033bcab65da30abf2219e385 jdk7u72-b08
+7637d4b21a9e3237f129f69a0dc7132877f3ab19 jdk7u72-b09
+a3d6d3327b32cd7fb41a144d48f957170dde3ba8 jdk7u72-b10
+d3fbd111daa01dc1737afd0a59084e14664d581a jdk7u72-b11
 7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
 4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
 25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
diff -r 498ddd5ee22c -r 90b8e5b32e58 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Wed Aug 20 12:12:57 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Aug 28 15:04:09 2014 -0700
@@ -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)
diff -r 498ddd5ee22c -r 90b8e5b32e58 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Wed Aug 20 12:12:57 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Thu Aug 28 15:04:09 2014 -0700
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Stack;
 import javax.xml.XMLConstants;
+import javax.xml.stream.XMLInputFactory;
 
 
 /**
@@ -302,6 +303,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;
 
@@ -1133,7 +1139,8 @@
             boolean parameter = entityName.startsWith("%");
             boolean general = !parameter;
             if (unparsed || (general && !fExternalGeneralEntities) ||
-                    (parameter && !fExternalParameterEntities)) {
+                    (parameter && !fExternalParameterEntities) ||
+                    !fSupportDTD || !fSupportExternalEntities) {
 
                 if (fEntityHandler != null) {
                     fResourceIdentifier.clear();
@@ -1428,6 +1435,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();
 
@@ -1499,6 +1510,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) {