Merge pull request #1 from jellyfin/master

merging myself to latest

1 files changed, 8 insertions, 9 deletions

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index 5f78674b8..067d5fa43 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -7,7 +7,6 @@ using System.Xml;
 using Emby.Dlna.Didl;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Model.Xml;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Service
@@ -18,13 +17,11 @@ namespace Emby.Dlna.Service
 
         protected readonly IServerConfigurationManager Config;
         protected readonly ILogger _logger;
-        protected readonly IXmlReaderSettingsFactory XmlReaderSettingsFactory;
 
-        protected BaseControlHandler(IServerConfigurationManager config, ILogger logger, IXmlReaderSettingsFactory xmlReaderSettingsFactory)
+        protected BaseControlHandler(IServerConfigurationManager config, ILogger logger)
         {
             Config = config;
             _logger = logger;
-            XmlReaderSettingsFactory = xmlReaderSettingsFactory;
         }
 
         public ControlResponse ProcessControlRequest(ControlRequest request)
@@ -61,11 +58,13 @@ namespace Emby.Dlna.Service
 
             using (var streamReader = new StreamReader(request.InputXml))
             {
-                var readerSettings = XmlReaderSettingsFactory.Create(false);
-
-                readerSettings.CheckCharacters = false;
-                readerSettings.IgnoreProcessingInstructions = true;
-                readerSettings.IgnoreComments = true;
+                var readerSettings = new XmlReaderSettings()
+                {
+                    ValidationType = ValidationType.None,
+                    CheckCharacters = false,
+                    IgnoreProcessingInstructions = true,
+                    IgnoreComments = true
+                };
 
                 using (var reader = XmlReader.Create(streamReader, readerSettings))
                 {