Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 16 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a5bb1a7..23475a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private const string ObjectRootPartStubXml = 
+        private const string ObjectRootPartStubXml =
 @"<SceneObjectGroup>
     <RootPart>
         <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -149,9 +149,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <llsd>
                     <map>
                         <key>MyNamespace</key>
-                        <map>                                
+                        <map>
                             <key>MyStore</key>
-                            <map>   
+                            <map>
                                 <key>the answer</key>
                                 <integer>42</integer>
                             </map>
@@ -162,12 +162,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         </SceneObjectPart>
     </RootPart>";
 
-        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
 @"
     <OtherParts />
 </SceneObjectGroup>";
 
-        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
 @"
   <OtherParts>
     <Part>
@@ -574,9 +574,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <llsd>
                         <map>
                             <key>MyNamespace</key>
-                            <map>                                
+                            <map>
                                 <key>MyStore</key>
-                                <map>   
+                                <map>
                                     <key>last words</key>
                                     <string>Rosebud</string>
                                 </map>
@@ -636,7 +636,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
                 OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
                 Assert.AreEqual(42, store["the answer"].AsInteger());
-            }                                    
+            }
 
             {
                 SceneObjectPart part = parts[1];
@@ -720,10 +720,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             string xml = SceneObjectSerializer.ToOriginalXmlFormat(so);
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
+            xtr.ProhibitDtd = true;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("RootPart");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -733,7 +735,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
@@ -831,9 +833,11 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options);
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
+            xtr.ProhibitDtd = true;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -843,7 +847,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":