mrglavas 2004/04/30 08:36:38
Modified: java/src/org/apache/xerces/impl XMLDocumentScannerImpl.java
XML11NSDocumentScannerImpl.java
XMLNSDocumentScannerImpl.java
Log:
If the disallow-doctype-decl feature is set to true, do not
query a user's ExternalSubsetResolver if there was no
DOCTYPE in the document.
Revision Changes Path
1.45 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java
Index: XMLDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- XMLDocumentScannerImpl.java 8 Apr 2004 22:24:52 -0000 1.44
+++ XMLDocumentScannerImpl.java 30 Apr 2004 15:36:38 -0000 1.45
@@ -1104,7 +1104,7 @@
throws IOException, XNIException {
if (fExternalSubsetResolver != null && !fSeenDoctypeDecl
- && (fValidation || fLoadExternalDTD)) {
+ && !fDisallowDoctype && (fValidation || fLoadExternalDTD)) {
scanStartElementName();
resolveExternalSubsetAndRead();
if (scanStartElementAfterName()) {
1.11 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java
Index: XML11NSDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XML11NSDocumentScannerImpl.java 8 Apr 2004 22:24:52 -0000 1.10
+++ XML11NSDocumentScannerImpl.java 30 Apr 2004 15:36:38 -0000 1.11
@@ -793,7 +793,7 @@
throws IOException, XNIException {
if (fExternalSubsetResolver != null && !fSeenDoctypeDecl
- && (fValidation || fLoadExternalDTD)) {
+ && !fDisallowDoctype && (fValidation || fLoadExternalDTD)) {
scanStartElementName();
resolveExternalSubsetAndRead();
reconfigurePipeline();
1.23 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
Index: XMLNSDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLNSDocumentScannerImpl.java 8 Apr 2004 22:24:52 -0000 1.22
+++ XMLNSDocumentScannerImpl.java 30 Apr 2004 15:36:38 -0000 1.23
@@ -716,8 +716,8 @@
protected boolean scanRootElementHook()
throws IOException, XNIException {
- if (fExternalSubsetResolver != null && !fSeenDoctypeDecl
- && (fValidation || fLoadExternalDTD)) {
+ if (fExternalSubsetResolver != null && !fSeenDoctypeDecl
+ && !fDisallowDoctype && (fValidation || fLoadExternalDTD)) {
scanStartElementName();
resolveExternalSubsetAndRead();
reconfigurePipeline();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
