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/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
View File

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

8
OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
View File

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