ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2018-01-16 17:17:44 +00:00
parent 8f1a68633e d39bf37926
commit b903287dd1
22 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
View File

@@ -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

5
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@@ -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));
}

3
OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
View File

@@ -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);
}