ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +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

4
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View File

@@ -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")
{

3
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

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

3
OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
View File

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

4
OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
View File

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