diff options
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | 8 |
2 files changed, 5 insertions, 6 deletions
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 | |||
54 | TRequest deserial; | 54 | TRequest deserial; |
55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) | 55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) |
56 | { | 56 | { |
57 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 57 | xmlReader.ProhibitDtd = true; |
58 | xmlReader.XmlResolver = null; | ||
59 | 58 | ||
60 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); | 59 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); |
61 | deserial = (TRequest) deserializer.Deserialize(xmlReader); | 60 | 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 | |||
210 | { | 210 | { |
211 | try | 211 | try |
212 | { | 212 | { |
213 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 213 | xmlReader.ProhibitDtd = true; |
214 | xmlReader.XmlResolver = null; | 214 | |
215 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); | 215 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); |
216 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); | 216 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); |
217 | } | 217 | } |
@@ -271,8 +271,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
271 | { | 271 | { |
272 | try | 272 | try |
273 | { | 273 | { |
274 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 274 | xmlReader.ProhibitDtd = true; |
275 | xmlReader.XmlResolver = null; | 275 | |
276 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); | 276 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); |
277 | deserial = (TRequest)deserializer.Deserialize(xmlReader); | 277 | deserial = (TRequest)deserializer.Deserialize(xmlReader); |
278 | } | 278 | } |