[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xerces-cvs
Subject:    svn commit: r661277 - in /xerces/c/trunk/src/xercesc/internal:
From:       amassari () apache ! org
Date:       2008-05-29 10:09:53
Message-ID: 20080529100953.D224823889FA () eris ! apache ! org
[Download RAW message or body]

Author: amassari
Date: Thu May 29 03:09:53 2008
New Revision: 661277

URL: http://svn.apache.org/viewvc?rev=661277&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/trunk/src/xercesc/internal/DGXMLScanner.cpp
    xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp

Modified: xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp?rev=661277&r1=661276&r2=661277&view=diff
 ==============================================================================
--- xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp Thu May 29 03:09:53 2008
@@ -1046,6 +1046,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
@@ -2180,6 +2181,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/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=661277&r1=661276&r2=661277&view=diff
 ==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Thu May 29 03:09:53 2008
@@ -1523,6 +1523,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
@@ -3127,6 +3128,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: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]