Merge pull request #1568 from whooo/master

Add DLNA headers if requested by the client

1 files changed, 2 insertions, 7 deletions

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 77b733dc9..1f78f5afc 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -690,8 +690,8 @@ namespace MediaBrowser.Api.Playback
                 request.AudioCodec = EncodingHelper.InferAudioCodec(url);
             }
 
-            var enableDlnaHeaders = !string.IsNullOrWhiteSpace(request.Params) /*||
-                                    string.Equals(Request.Headers.Get("GetContentFeatures.DLNA.ORG"), "1", StringComparison.OrdinalIgnoreCase)*/;
+            var enableDlnaHeaders = !string.IsNullOrWhiteSpace(request.Params) ||
+                                    string.Equals(GetHeader("GetContentFeatures.DLNA.ORG"), "1", StringComparison.OrdinalIgnoreCase);
 
             var state = new StreamState(MediaSourceManager, TranscodingJobType)
             {
@@ -1016,11 +1016,6 @@ namespace MediaBrowser.Api.Playback
 
                     ).FirstOrDefault() ?? string.Empty;
             }
-
-            foreach (var item in responseHeaders)
-            {
-                Request.Response.Headers.Add(item.Key, item.Value);
-            }
         }
 
         private void AddTimeSeekResponseHeaders(StreamState state, IDictionary<string, string> responseHeaders)