Mercurial > hg > release > icedtea7-forest-2.6 > jaxp

changeset 1377:bc6edb6c12a7 icedtea-2.6.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u95-b00
author andrew
date Mon, 18 Jan 2016 15:52:13 +0000
parents 4418bf472260 (current diff) c029d7572a67 (diff)
children 9690f0cea1ad
files .hgtags src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java src/com/sun/xml/internal/stream/Entity.java
diffstat 10 files changed, 26 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Nov 13 08:31:52 2015 +0000
+++ b/.hgtags	Mon Jan 18 15:52:13 2016 +0000
@@ -650,3 +650,4 @@
 f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2
 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02
 f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3
+7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java	Mon Jan 18 15:52:13 2016 +0000
@@ -1362,7 +1362,7 @@
   {  "optionE", "   [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
   {  "optionV",  "   [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
   {  "optionQC", "   [-QC (Stille Musterkonfliktwarnungen)]"},
-  {  "optionQ", "   [-Q  (Stiller Modus)]"},
+  {  "optionQ", "   [-Q  (Silent-Modus)]"},
   {  "optionLF", "   [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"},
   {  "optionCR", "   [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"},
   { "optionESCAPE", "   [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"},
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java	Mon Jan 18 15:52:13 2016 +0000
@@ -1213,7 +1213,7 @@
       "Le nom de fonction ne peut pas \u00EAtre NULL."},
 
     { ER_XPATH_RESOLVER_NEGATIVE_ARITY,
-      "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."},
+      "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."},
   // Warnings...
 
     { WG_FOUND_CURLYBRACE,
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java	Mon Jan 18 15:52:13 2016 +0000
@@ -932,9 +932,9 @@
                     //Check if FSP and SM - only then proceed with loading
                     if (namespace != null && isSecureProcessing
                             && isExtensionFunctionEnabled
-                            && (namespace.equals(JAVA_EXT_XALAN)
-                            || namespace.equals(JAVA_EXT_XSLTC)
-                            || namespace.equals(JAVA_EXT_XALAN_OLD)
+                            && (namespace.startsWith(JAVA_EXT_XALAN)
+                            || namespace.startsWith(JAVA_EXT_XSLTC)
+                            || namespace.startsWith(JAVA_EXT_XALAN_OLD)
                             || namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) {
                         _clazz = getXSLTC().loadExternalFunction(_className);
                     } else {
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Mon Jan 18 15:52:13 2016 +0000
@@ -332,7 +332,7 @@
                                                          new Object[]{entityName});
                                     }
                                 }
-                                fEntityManager.startEntity(false, entityName, true);
+                                fEntityManager.startEntity(true, entityName, true);
                             }
                         }
                     }
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	Mon Jan 18 15:52:13 2016 +0000
@@ -905,7 +905,7 @@
         }
         int length = fCurrentEntity.position - offset;
         fCurrentEntity.columnNumber += length - newlines;
-        if (fCurrentEntity.reference) {
+        if (fCurrentEntity.isGE) {
             checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
         }
         content.setValues(fCurrentEntity.ch, offset, length);
@@ -1052,6 +1052,9 @@
         }
         int length = fCurrentEntity.position - offset;
         fCurrentEntity.columnNumber += length - newlines;
+        if (fCurrentEntity.isGE) {
+            checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
+        }
         content.setValues(fCurrentEntity.ch, offset, length);
 
         // return next character
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Mon Jan 18 15:52:13 2016 +0000
@@ -1105,7 +1105,7 @@
     /**
      * Starts a named entity.
      *
-     * @param reference flag to indicate whether the entity is an Entity Reference.
+     * @param isGE flag to indicate whether the entity is a General Entity
      * @param entityName The name of the entity to start.
      * @param literal    True if this entity is started within a literal
      *                   value.
@@ -1113,7 +1113,7 @@
      * @throws IOException  Thrown on i/o error.
      * @throws XNIException Thrown by entity handler to signal an error.
      */
-    public void startEntity(boolean reference, String entityName, boolean literal)
+    public void startEntity(boolean isGE, String entityName, boolean literal)
     throws IOException, XNIException {
 
         // was entity declared?
@@ -1237,7 +1237,7 @@
         }
 
         // start the entity
-        startEntity(reference, entityName, xmlInputSource, literal, external);
+        startEntity(isGE, entityName, xmlInputSource, literal, external);
 
     } // startEntity(String,boolean)
 
@@ -1286,7 +1286,7 @@
      * This method can be used to insert an application defined XML
      * entity stream into the parsing stream.
      *
-     * @param reference flag to indicate whether the entity is an Entity Reference.
+     * @param isGE flag to indicate whether the entity is a General Entity
      * @param name           The name of the entity.
      * @param xmlInputSource The input source of the entity.
      * @param literal        True if this entity is started within a
@@ -1296,12 +1296,12 @@
      * @throws IOException  Thrown on i/o error.
      * @throws XNIException Thrown by entity handler to signal an error.
      */
-    public void startEntity(boolean reference, String name,
+    public void startEntity(boolean isGE, String name,
             XMLInputSource xmlInputSource,
             boolean literal, boolean isExternal)
             throws IOException, XNIException {
 
-        String encoding = setupCurrentEntity(reference, name, xmlInputSource, literal, isExternal);
+        String encoding = setupCurrentEntity(isGE, name, xmlInputSource, literal, isExternal);
 
         //when entity expansion limit is set by the Application, we need to
         //check for the entity expansion limit set by the parser, if number of entity
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Mon Jan 18 15:52:13 2016 +0000
@@ -1038,7 +1038,7 @@
         }
         int length = fCurrentEntity.position - offset;
         fCurrentEntity.columnNumber += length - newlines;
-        if (fCurrentEntity.reference) {
+        if (fCurrentEntity.isGE) {
             checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
         }
 
@@ -1215,6 +1215,9 @@
         }
         int length = fCurrentEntity.position - offset;
         fCurrentEntity.columnNumber += length - newlines;
+        if (fCurrentEntity.isGE) {
+            checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
+        }
         content.setValues(fCurrentEntity.ch, offset, length);
 
         // return next character
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Mon Jan 18 15:52:13 2016 +0000
@@ -947,7 +947,7 @@
                                                 new Object[]{entityName});
                                     }
                                 }
-                                fEntityManager.startEntity(false, entityName, true);
+                                fEntityManager.startEntity(true, entityName, true);
                             }
                         }
                     }
--- a/src/com/sun/xml/internal/stream/Entity.java	Fri Nov 13 08:31:52 2015 +0000
+++ b/src/com/sun/xml/internal/stream/Entity.java	Mon Jan 18 15:52:13 2016 +0000
@@ -344,8 +344,8 @@
         // to know that prolog is read
         public boolean xmlDeclChunkRead = false;
 
-        // flag to indicate whether the Entity is an Entity Reference
-        public boolean reference = false;
+        // flag to indicate whether the Entity is a General Entity
+        public boolean isGE = false;
 
         /** returns the name of the current encoding
          *  @return current encoding name
@@ -391,11 +391,11 @@
         //
 
         /** Constructs a scanned entity. */
-        public ScannedEntity(boolean reference, String name,
+        public ScannedEntity(boolean isGE, String name,
                 XMLResourceIdentifier entityLocation,
                 InputStream stream, Reader reader,
                 String encoding, boolean literal, boolean mayReadChunks, boolean isExternal) {
-            this.reference = reference;
+            this.isGE = isGE;
             this.name = name ;
             this.entityLocation = entityLocation;
             this.stream = stream;