Merge branch 'master' into httptests

22 files changed, 32 insertions, 42 deletions

diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs
index 5ed312c..fc41113 100644
--- a/OpenSim/Capabilities/LLSD.cs
+++ b/OpenSim/Capabilities/LLSD.cs
@@ -83,8 +83,7 @@ namespace OpenSim.Framework.Capabilities
         {
             using (XmlTextReader reader = new XmlTextReader(st))
             {
-                reader.DtdProcessing = DtdProcessing.Prohibit;
-                reader.XmlResolver = null;
+                reader.ProhibitDtd = true;
 
                 reader.Read();
                 SkipWS(reader);
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
index 8a0e43e..fa83de8 100644
--- a/OpenSim/Framework/PhysicsInertia.cs
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -193,8 +193,7 @@ namespace OpenSim.Framework
             using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
                 using(XmlTextReader xreader = new XmlTextReader(ms))
                 {
-                    xreader.DtdProcessing = DtdProcessing.Prohibit;
-                    xreader.XmlResolver = null;
+                    xreader.ProhibitDtd = true;
 
                     v = new PhysicsInertiaData();
                     v.FromXml2(xreader, out error);
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 1dc8bc3..6e7a038 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1595,8 +1595,7 @@ namespace OpenSim.Framework
                     {
                         using (XmlTextReader xtr = new XmlTextReader(sr))
                         {
-                            xtr.DtdProcessing = DtdProcessing.Prohibit;
-                            xtr.XmlResolver = null;
+                            xtr.ProhibitDtd = true;
 
                             xtr.MoveToContent();
 
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index da877a7..af130a5 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
             using (StringWriter sw = new StringWriter())
             using (XmlTextWriter writer = new XmlTextWriter(sw))
             using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
-            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
             {
                 TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);
 
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index d323f45..33ffd83 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -178,8 +178,7 @@ namespace OpenSim.Framework.Serialization.External
 
             using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
             {
-                reader.DtdProcessing = DtdProcessing.Prohibit;
-                reader.XmlResolver = null;
+                reader.ProhibitDtd = true;
                 reader.ReadStartElement("LandData");
 
                 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index fb4f904..fd21f3e 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -63,8 +63,7 @@ namespace OpenSim.Framework.Serialization.External
 
             StringReader sr = new StringReader(serializedSettings);
             XmlTextReader xtr = new XmlTextReader(sr);
-            xtr.DtdProcessing = DtdProcessing.Prohibit;
-            xtr.XmlResolver = null;
+            xtr.ProhibitDtd = true;
 
             xtr.ReadStartElement("RegionSettings");
 
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 3c51140..12194ad 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -202,8 +202,7 @@ namespace OpenSim.Framework.Serialization.External
 
             using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
             {
-                reader.DtdProcessing = DtdProcessing.Prohibit;
-                reader.XmlResolver = null;
+                reader.ProhibitDtd = true;
 
                 reader.ReadStartElement("InventoryItem");
 
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index fbc51d5..67fc14e 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -54,8 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             TRequest deserial;
             using (XmlTextReader xmlReader = new XmlTextReader(request))
             {
-                xmlReader.DtdProcessing = DtdProcessing.Prohibit;
-                xmlReader.XmlResolver = null;
+                xmlReader.ProhibitDtd = true;
 
                 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
                 deserial = (TRequest) deserializer.Deserialize(xmlReader);
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index dc720dd..158befa 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -210,8 +210,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 try
                 {
-                    xmlReader.DtdProcessing = DtdProcessing.Prohibit;
-                    xmlReader.XmlResolver = null;
+                    xmlReader.ProhibitDtd = true;
+
                     XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
                     deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
                 }
@@ -271,8 +271,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 try
                 {
-                    xmlReader.DtdProcessing = DtdProcessing.Prohibit;
-                    xmlReader.XmlResolver = null;
+                    xmlReader.ProhibitDtd = true;
+
                     XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
                     deserial = (TRequest)deserializer.Deserialize(xmlReader);
                 }
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index 013b416..61e461a 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -124,8 +124,8 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
                     {
                         using(XmlTextReader sr = new XmlTextReader(s))
                         {
-                            sr.DtdProcessing = DtdProcessing.Prohibit;
-                            sr.XmlResolver = null;
+                            sr.ProhibitDtd = true;
+
                             sr.ReadStartElement("BakedAppearance");
                             while(sr.LocalName == "BakedTexture")
                             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 63ebf86..41515c0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1130,8 +1130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
             XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
             XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
-            xtr.DtdProcessing = DtdProcessing.Prohibit;
-            xtr.XmlResolver = null;
+            xtr.ProhibitDtd = true;
 
             // Loaded metadata will be empty if no information exists in the archive
             dearchivedScenes.LoadedCreationDateTime = 0;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 92c935b..5d3be62 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -93,8 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             StringReader sr = new StringReader(xml);
             XmlTextReader reader = new XmlTextReader(sr);
-            reader.DtdProcessing = DtdProcessing.Prohibit;
-            reader.XmlResolver = null;
+            reader.ProhibitDtd = true;
 
             reader.ReadStartElement("assets");
             reader.Read();
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index c9e3141..23475a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -720,6 +720,8 @@ 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");
@@ -831,6 +833,8 @@ 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");
 
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index 38ab934..2128d58 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -58,8 +58,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             using (XmlTextReader reader = new XmlTextReader(path))
             {
-                reader.DtdProcessing = DtdProcessing.Prohibit;
-                reader.XmlResolver = null;
+                reader.ProhibitDtd = true;
+
                 XmlDocument doc = new XmlDocument();
                 doc.XmlResolver = null;
 
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 22734b3..6683614 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -593,8 +593,7 @@ namespace OpenSim.Region.Framework.Scenes
             UTF8Encoding enc = new UTF8Encoding();
             MemoryStream ms = new MemoryStream(enc.GetBytes(text));
             XmlTextReader xreader = new XmlTextReader(ms);
-            xreader.DtdProcessing = DtdProcessing.Prohibit;
-            xreader.XmlResolver = null;
+            xreader.ProhibitDtd = true;
 
             SOPVehicle v = new SOPVehicle();
             bool error;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 84367df..b3303a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
                 {
-                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
                     {
                         reader.Read();
                         bool isSingleObject = reader.Name != "CoalescedObject";
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c223aae..6497444 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1943,7 +1943,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (!m_backingup)
             {
-                WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name));
+                WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name, false));
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index c3bc4a0..abcb573 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -133,8 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
-                        reader.XmlResolver = null;
+                        reader.ProhibitDtd = true;
 
                         reader.MoveToContent(); // skip possible xml declaration
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 66bf536..9a20706 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
             using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
             {
-                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
                 {
                     try
                     {
@@ -272,8 +272,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using(XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
-                        reader.XmlResolver = null;
+                        reader.ProhibitDtd = true;
 
                         sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
                     }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 977dd73..0ebc645 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -57,8 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 using(XmlTextReader reader = new XmlTextReader(fileName))
                 {
                     reader.WhitespaceHandling = WhitespaceHandling.None;
-                    reader.DtdProcessing = DtdProcessing.Prohibit;
-                    reader.XmlResolver = null;
+                    reader.ProhibitDtd = true;
 
                     doc.Load(reader);
                 }
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1beca04..20bad94 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -200,8 +200,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 using(XmlTextReader reader = new XmlTextReader(sr))
                 {
-                    reader.DtdProcessing = DtdProcessing.Prohibit;
-                    reader.XmlResolver = null;
+                    reader.ProhibitDtd = true;
+
                     ReadXml(reader);
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 08242b6..defaa9c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -1148,8 +1148,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     using (Stream s = rsp.GetResponseStream())
                     using (XmlTextReader rdr = new XmlTextReader(s))
                     {
-                            rdr.DtdProcessing = DtdProcessing.Prohibit;
-                            rdr.XmlResolver = null;
+                            rdr.ProhibitDtd = true;
                             doc.Load(rdr);
                     }
                 }