Mercurial > hg > release > icedtea8-forest-3.0 > jaxp
changeset 1312:5b397799a7e9
Merge
| author | asaha |
|---|---|
| date | Thu, 03 Dec 2015 13:14:24 -0800 |
| parents | 0b734f331213 (diff) d11c3bc0881a (current diff) |
| children | 8c68f448ec4a 49031c4f768f |
| files | .hgtags |
| diffstat | 10 files changed, 50 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Dec 03 10:32:07 2015 -0800 +++ b/.hgtags Thu Dec 03 13:14:24 2015 -0800 @@ -498,8 +498,33 @@ 25cf8ddfc8bf163211d1dfd79f31765cac58eef5 jdk8u66-b15 40ce5a6d733d44d93cbd5c0105a820ad7a7f4754 jdk8u66-b16 fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17 +4ae0c2d6dd24931f3f271e645221e5331e351c00 jdk8u66-b18 8af7da6c13af3c95bc9933e6d1e0d83648f6c0ae jdk8u66-b31 1db6026e38d41f217bcbe2b619711b850c1788f4 jdk8u66-b32 a85030db026108135a95b86c343280ed7bda322a jdk8u66-b33 59dc259db9ad7d7eaa98b9540734bd5c22d9bc86 jdk8u66-b34 a9f8281d8391e90f255bb754d1d6b31dba18e77d jdk8u66-b35 +700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00 +f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 +90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02 +33134f35eea3fbffd695d24229d7894c7c2cf14f jdk8u71-b03 +28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04 +6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05 +ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 +5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07 +6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08 +19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09 +d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10 +e71972e92232ad5bb17c79609d75ad3b8062bf10 jdk8u71-b11 +60e623d06ebdcdc681943b16f00a87aeedf46873 jdk8u72-b00 +176a2ce2e2d6fd07964eca60c28c6b0049d7bc4d jdk8u72-b01 +3c5915665396301b730f808f8f5aa6e95b7c6113 jdk8u72-b02 +fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 +5b5626716c88646895c4ada9ed1a35b24e7148c8 jdk8u72-b04 +1636e47c2d48d92827dac1493d292ebe19a2e108 jdk8u72-b05 +3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06 +8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07 +be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 +8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09 +619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10 +8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Thu Dec 03 13:14:24 2015 -0800 @@ -1359,7 +1359,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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Thu Dec 03 13:14:24 2015 -0800 @@ -1210,7 +1210,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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Thu Dec 03 13:14:24 2015 -0800 @@ -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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java Thu Dec 03 13:14:24 2015 -0800 @@ -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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Thu Dec 03 13:14:24 2015 -0800 @@ -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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Thu Dec 03 13:14:24 2015 -0800 @@ -1106,7 +1106,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. @@ -1114,7 +1114,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? @@ -1238,7 +1238,7 @@ } // start the entity - startEntity(reference, entityName, xmlInputSource, literal, external); + startEntity(isGE, entityName, xmlInputSource, literal, external); } // startEntity(String,boolean) @@ -1287,7 +1287,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 @@ -1297,12 +1297,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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Thu Dec 03 13:14:24 2015 -0800 @@ -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); } @@ -1205,6 +1205,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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Thu Dec 03 13:14:24 2015 -0800 @@ -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 Thu Dec 03 10:32:07 2015 -0800 +++ b/src/com/sun/xml/internal/stream/Entity.java Thu Dec 03 13:14:24 2015 -0800 @@ -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;