diff options
Diffstat (limited to 'OpenSim')
20 files changed, 3 insertions, 40 deletions
diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs index fc41113..76e439f 100644 --- a/OpenSim/Capabilities/LLSD.cs +++ b/OpenSim/Capabilities/LLSD.cs | |||
@@ -83,8 +83,6 @@ namespace OpenSim.Framework.Capabilities | |||
83 | { | 83 | { |
84 | using (XmlTextReader reader = new XmlTextReader(st)) | 84 | using (XmlTextReader reader = new XmlTextReader(st)) |
85 | { | 85 | { |
86 | reader.ProhibitDtd = true; | ||
87 | |||
88 | reader.Read(); | 86 | reader.Read(); |
89 | SkipWS(reader); | 87 | SkipWS(reader); |
90 | 88 | ||
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs index fa83de8..5aae6d5 100644 --- a/OpenSim/Framework/PhysicsInertia.cs +++ b/OpenSim/Framework/PhysicsInertia.cs | |||
@@ -193,8 +193,6 @@ namespace OpenSim.Framework | |||
193 | using(MemoryStream ms = new MemoryStream(enc.GetBytes(text))) | 193 | using(MemoryStream ms = new MemoryStream(enc.GetBytes(text))) |
194 | using(XmlTextReader xreader = new XmlTextReader(ms)) | 194 | using(XmlTextReader xreader = new XmlTextReader(ms)) |
195 | { | 195 | { |
196 | xreader.ProhibitDtd = true; | ||
197 | |||
198 | v = new PhysicsInertiaData(); | 196 | v = new PhysicsInertiaData(); |
199 | v.FromXml2(xreader, out error); | 197 | v.FromXml2(xreader, out error); |
200 | } | 198 | } |
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 6e7a038..5056c04 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -1595,8 +1595,6 @@ namespace OpenSim.Framework | |||
1595 | { | 1595 | { |
1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) | 1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) |
1597 | { | 1597 | { |
1598 | xtr.ProhibitDtd = true; | ||
1599 | |||
1600 | xtr.MoveToContent(); | 1598 | xtr.MoveToContent(); |
1601 | 1599 | ||
1602 | string type = xtr.GetAttribute("type"); | 1600 | string type = xtr.GetAttribute("type"); |
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs index af130a5..64b5d41 100644 --- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs +++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External | |||
221 | using (StringWriter sw = new StringWriter()) | 221 | using (StringWriter sw = new StringWriter()) |
222 | using (XmlTextWriter writer = new XmlTextWriter(sw)) | 222 | using (XmlTextWriter writer = new XmlTextWriter(sw)) |
223 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) | 223 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) |
224 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true})) | 224 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
225 | { | 225 | { |
226 | TransformXml(reader, writer, sceneName, homeURL, userService, scopeID); | 226 | TransformXml(reader, writer, sceneName, homeURL, userService, scopeID); |
227 | 227 | ||
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index 33ffd83..e42d56f 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
@@ -178,7 +178,6 @@ namespace OpenSim.Framework.Serialization.External | |||
178 | 178 | ||
179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) | 179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) |
180 | { | 180 | { |
181 | reader.ProhibitDtd = true; | ||
182 | reader.ReadStartElement("LandData"); | 181 | reader.ReadStartElement("LandData"); |
183 | 182 | ||
184 | ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); | 183 | ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); |
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index fd21f3e..617c451 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
@@ -63,7 +63,6 @@ namespace OpenSim.Framework.Serialization.External | |||
63 | 63 | ||
64 | StringReader sr = new StringReader(serializedSettings); | 64 | StringReader sr = new StringReader(serializedSettings); |
65 | XmlTextReader xtr = new XmlTextReader(sr); | 65 | XmlTextReader xtr = new XmlTextReader(sr); |
66 | xtr.ProhibitDtd = true; | ||
67 | 66 | ||
68 | xtr.ReadStartElement("RegionSettings"); | 67 | xtr.ReadStartElement("RegionSettings"); |
69 | 68 | ||
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index 12194ad..9b02553 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
@@ -202,8 +202,6 @@ namespace OpenSim.Framework.Serialization.External | |||
202 | 202 | ||
203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) | 203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) |
204 | { | 204 | { |
205 | reader.ProhibitDtd = true; | ||
206 | |||
207 | reader.ReadStartElement("InventoryItem"); | 205 | reader.ReadStartElement("InventoryItem"); |
208 | 206 | ||
209 | ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>( | 207 | ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>( |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs index 67fc14e..bd55657 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs | |||
@@ -54,8 +54,6 @@ 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.ProhibitDtd = true; | ||
58 | |||
59 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); | 57 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); |
60 | deserial = (TRequest) deserializer.Deserialize(xmlReader); | 58 | deserial = (TRequest) deserializer.Deserialize(xmlReader); |
61 | } | 59 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs index 158befa..68073c1 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
@@ -210,8 +210,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
210 | { | 210 | { |
211 | try | 211 | try |
212 | { | 212 | { |
213 | xmlReader.ProhibitDtd = true; | ||
214 | |||
215 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); | 213 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); |
216 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); | 214 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); |
217 | } | 215 | } |
@@ -271,8 +269,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
271 | { | 269 | { |
272 | try | 270 | try |
273 | { | 271 | { |
274 | xmlReader.ProhibitDtd = true; | ||
275 | |||
276 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); | 272 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); |
277 | deserial = (TRequest)deserializer.Deserialize(xmlReader); | 273 | deserial = (TRequest)deserializer.Deserialize(xmlReader); |
278 | } | 274 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index 61e461a..cfa9581 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
@@ -124,8 +124,6 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
124 | { | 124 | { |
125 | using(XmlTextReader sr = new XmlTextReader(s)) | 125 | using(XmlTextReader sr = new XmlTextReader(s)) |
126 | { | 126 | { |
127 | sr.ProhibitDtd = true; | ||
128 | |||
129 | sr.ReadStartElement("BakedAppearance"); | 127 | sr.ReadStartElement("BakedAppearance"); |
130 | while(sr.LocalName == "BakedTexture") | 128 | while(sr.LocalName == "BakedTexture") |
131 | { | 129 | { |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 41515c0..99ff9b5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1130,7 +1130,6 @@ 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.ProhibitDtd = true; | ||
1134 | 1133 | ||
1135 | // Loaded metadata will be empty if no information exists in the archive | 1134 | // Loaded metadata will be empty if no information exists in the archive |
1136 | dearchivedScenes.LoadedCreationDateTime = 0; | 1135 | dearchivedScenes.LoadedCreationDateTime = 0; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 5d3be62..8c0ef88 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -93,7 +93,6 @@ 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.ProhibitDtd = true; | ||
97 | 96 | ||
98 | reader.ReadStartElement("assets"); | 97 | reader.ReadStartElement("assets"); |
99 | reader.Read(); | 98 | reader.Read(); |
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 2128d58..78f545b 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
@@ -58,8 +58,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
58 | 58 | ||
59 | using (XmlTextReader reader = new XmlTextReader(path)) | 59 | using (XmlTextReader reader = new XmlTextReader(path)) |
60 | { | 60 | { |
61 | reader.ProhibitDtd = true; | ||
62 | |||
63 | XmlDocument doc = new XmlDocument(); | 61 | XmlDocument doc = new XmlDocument(); |
64 | doc.XmlResolver = null; | 62 | doc.XmlResolver = null; |
65 | 63 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index 6683614..351eda3 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
@@ -593,7 +593,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
593 | UTF8Encoding enc = new UTF8Encoding(); | 593 | UTF8Encoding enc = new UTF8Encoding(); |
594 | MemoryStream ms = new MemoryStream(enc.GetBytes(text)); | 594 | MemoryStream ms = new MemoryStream(enc.GetBytes(text)); |
595 | XmlTextReader xreader = new XmlTextReader(ms); | 595 | XmlTextReader xreader = new XmlTextReader(ms); |
596 | xreader.ProhibitDtd = true; | ||
597 | 596 | ||
598 | SOPVehicle v = new SOPVehicle(); | 597 | SOPVehicle v = new SOPVehicle(); |
599 | bool error; | 598 | bool error; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b3303a0..e8a8a6e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2389 | { | 2389 | { |
2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) | 2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) |
2391 | { | 2391 | { |
2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true })) | 2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
2393 | { | 2393 | { |
2394 | reader.Read(); | 2394 | reader.Read(); |
2395 | bool isSingleObject = reader.Name != "CoalescedObject"; | 2395 | bool isSingleObject = reader.Name != "CoalescedObject"; |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index abcb573..a93782e 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -133,8 +133,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
133 | { | 133 | { |
134 | using (XmlTextReader reader = new XmlTextReader(sr)) | 134 | using (XmlTextReader reader = new XmlTextReader(sr)) |
135 | { | 135 | { |
136 | reader.ProhibitDtd = true; | ||
137 | |||
138 | reader.MoveToContent(); // skip possible xml declaration | 136 | reader.MoveToContent(); // skip possible xml declaration |
139 | 137 | ||
140 | if (reader.Name != "CoalescedObject") | 138 | if (reader.Name != "CoalescedObject") |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 9a20706..1196c28 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
63 | String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); | 63 | String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); |
64 | using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) | 64 | using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) |
65 | { | 65 | { |
66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true })) | 66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
@@ -271,11 +271,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
271 | using(StringReader sr = new StringReader(parts[0].OuterXml)) | 271 | using(StringReader sr = new StringReader(parts[0].OuterXml)) |
272 | { | 272 | { |
273 | using(XmlTextReader reader = new XmlTextReader(sr)) | 273 | using(XmlTextReader reader = new XmlTextReader(sr)) |
274 | { | ||
275 | reader.ProhibitDtd = true; | ||
276 | |||
277 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); | 274 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); |
278 | } | ||
279 | } | 275 | } |
280 | 276 | ||
281 | // Then deal with the rest | 277 | // Then deal with the rest |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 0ebc645..09e3f9c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -57,7 +57,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
57 | using(XmlTextReader reader = new XmlTextReader(fileName)) | 57 | using(XmlTextReader reader = new XmlTextReader(fileName)) |
58 | { | 58 | { |
59 | reader.WhitespaceHandling = WhitespaceHandling.None; | 59 | reader.WhitespaceHandling = WhitespaceHandling.None; |
60 | reader.ProhibitDtd = true; | ||
61 | 60 | ||
62 | doc.Load(reader); | 61 | doc.Load(reader); |
63 | } | 62 | } |
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 20bad94..92fd314 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
@@ -199,11 +199,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
199 | using(StringReader sr = new StringReader(data)) | 199 | using(StringReader sr = new StringReader(data)) |
200 | { | 200 | { |
201 | using(XmlTextReader reader = new XmlTextReader(sr)) | 201 | using(XmlTextReader reader = new XmlTextReader(sr)) |
202 | { | ||
203 | reader.ProhibitDtd = true; | ||
204 | |||
205 | ReadXml(reader); | 202 | ReadXml(reader); |
206 | } | ||
207 | } | 203 | } |
208 | } | 204 | } |
209 | 205 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index defaa9c..e88d850 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -1147,10 +1147,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1147 | using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse()) | 1147 | using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse()) |
1148 | using (Stream s = rsp.GetResponseStream()) | 1148 | using (Stream s = rsp.GetResponseStream()) |
1149 | using (XmlTextReader rdr = new XmlTextReader(s)) | 1149 | using (XmlTextReader rdr = new XmlTextReader(s)) |
1150 | { | ||
1151 | rdr.ProhibitDtd = true; | ||
1152 | doc.Load(rdr); | 1150 | doc.Load(rdr); |
1153 | } | ||
1154 | } | 1151 | } |
1155 | catch (Exception e) | 1152 | catch (Exception e) |
1156 | { | 1153 | { |