diff options
author | UbitUmarov | 2018-01-09 19:47:10 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-09 19:47:10 +0000 |
commit | e908c0ecadb9d44102ee649c5f9184e6e3034541 (patch) | |
tree | 6e863f496489ada72c128a6f545898b849d8f876 /OpenSim/Framework/Servers/HttpServer | |
parent | test our obsolete jenkins ... (diff) | |
download | opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.zip opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.gz opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.bz2 opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.xz |
give up on a property that old monos do compile, but then smore ok exec
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs index 7e2d909..67fc14e 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) | 55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) |
56 | { | 56 | { |
57 | xmlReader.ProhibitDtd = true; | 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 1887a13..158befa 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
211 | try | 211 | try |
212 | { | 212 | { |
213 | xmlReader.ProhibitDtd = true; | 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 | } |
@@ -272,7 +272,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
272 | try | 272 | try |
273 | { | 273 | { |
274 | xmlReader.ProhibitDtd = true; | 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 | } |