svn commit: r661278 - in /xerces/c/branches/xerces-2/src/xercesc/internal: DGXMLScanner.cpp IGXMLScanner.cpp

[amassari]

Author: amassari
Date: Thu May 29 03:13:41 2008
New Revision: 661278

URL: http://svn.apache.org/viewvc?rev=661278&view=rev
Log:
The fix for XERCESC-1763 didn't mark the external DTD as an external entity, 
leading to the wrong base URI being applied to its content

Modified:
    xerces/c/branches/xerces-2/src/xercesc/internal/DGXMLScanner.cpp
    xerces/c/branches/xerces-2/src/xercesc/internal/IGXMLScanner.cpp

Modified: xerces/c/branches/xerces-2/src/xercesc/internal/DGXMLScanner.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/internal/DGXMLScanner.cpp?rev=661278&r1=661277&r2=661278&view=diff
==============================================================================
--- xerces/c/branches/xerces-2/src/xercesc/internal/DGXMLScanner.cpp (original)
+++ xerces/c/branches/xerces-2/src/xercesc/internal/DGXMLScanner.cpp Thu May 29 
03:13:41 2008
@@ -1055,6 +1055,7 @@
             const XMLCh gDTDStr[] = { chLatin_D, chLatin_T, chLatin_D , chNull 
};
             DTDEntityDecl* declDTD = new (fMemoryManager) 
DTDEntityDecl(gDTDStr, false, fMemoryManager);
             declDTD->setSystemId(sysId);
+            declDTD->setIsExternal(true);
             Janitor<DTDEntityDecl> janDecl(declDTD);
 
             // Mark this one as a throw at end
@@ -2202,6 +2203,7 @@
     const XMLCh gDTDStr[] = { chLatin_D, chLatin_T, chLatin_D , chNull };
     DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, 
false, fMemoryManager);
     declDTD->setSystemId(src.getSystemId());
+    declDTD->setIsExternal(true);
     Janitor<DTDEntityDecl> janDecl(declDTD);
 
     // Mark this one as a throw at end

Modified: xerces/c/branches/xerces-2/src/xercesc/internal/IGXMLScanner.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/internal/IGXMLScanner.cpp?rev=661278&r1=661277&r2=661278&view=diff
==============================================================================
--- xerces/c/branches/xerces-2/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/branches/xerces-2/src/xercesc/internal/IGXMLScanner.cpp Thu May 29 
03:13:41 2008
@@ -1532,6 +1532,7 @@
             const XMLCh gDTDStr[] = { chLatin_D, chLatin_T, chLatin_D , chNull 
};
             DTDEntityDecl* declDTD = new (fMemoryManager) 
DTDEntityDecl(gDTDStr, false, fMemoryManager);
             declDTD->setSystemId(sysId);
+            declDTD->setIsExternal(true);
             Janitor<DTDEntityDecl> janDecl(declDTD);
 
             // Mark this one as a throw at end
@@ -3148,6 +3149,7 @@
     const XMLCh gDTDStr[] = { chLatin_D, chLatin_T, chLatin_D , chNull };
     DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, 
false, fMemoryManager);
     declDTD->setSystemId(src.getSystemId());
+    declDTD->setIsExternal(true);
     Janitor<DTDEntityDecl> janDecl(declDTD);
 
     // Mark this one as a throw at end



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]