diff options
| author | UbitUmarov | 2018-01-16 17:17:44 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-16 17:17:44 +0000 |
| commit | b903287dd154204d7d277b9a5fcd01a4933e67a1 (patch) | |
| tree | 2f23b11df3d832b3631b7415cc6c374b18de2384 /OpenSim/Region/CoreModules/World/Archiver | |
| parent | update lsl2c tools and parsing files. This may fix some issues with precenden... (diff) | |
| parent | do not timeout BackupWorker threads (diff) | |
| download | opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.zip opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.gz opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.bz2 opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | 3 |
2 files changed, 2 insertions, 4 deletions
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 | |||
| 1130 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); | 1130 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); |
| 1131 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); | 1131 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); |
| 1132 | XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); | 1132 | XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); |
| 1133 | xtr.DtdProcessing = DtdProcessing.Prohibit; | 1133 | xtr.ProhibitDtd = true; |
| 1134 | xtr.XmlResolver = null; | ||
| 1135 | 1134 | ||
| 1136 | // Loaded metadata will be empty if no information exists in the archive | 1135 | // Loaded metadata will be empty if no information exists in the archive |
| 1137 | dearchivedScenes.LoadedCreationDateTime = 0; | 1136 | 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 | |||
| 93 | 93 | ||
| 94 | StringReader sr = new StringReader(xml); | 94 | StringReader sr = new StringReader(xml); |
| 95 | XmlTextReader reader = new XmlTextReader(sr); | 95 | XmlTextReader reader = new XmlTextReader(sr); |
| 96 | reader.DtdProcessing = DtdProcessing.Prohibit; | 96 | reader.ProhibitDtd = true; |
| 97 | reader.XmlResolver = null; | ||
| 98 | 97 | ||
| 99 | reader.ReadStartElement("assets"); | 98 | reader.ReadStartElement("assets"); |
| 100 | reader.Read(); | 99 | reader.Read(); |