diff options
| author | Chris Schneider <schneifu@hotmail.com> | 2013-03-14 21:43:26 -0500 |
|---|---|---|
| committer | Chris Schneider <schneifu@hotmail.com> | 2013-03-14 21:43:26 -0500 |
| commit | 064b3d58cc4cec91743fc48b4605a6acb1942448 (patch) | |
| tree | ca27178d1ed55f4ba8a13b6fef355d34b3c86fa4 | |
| parent | efea777b99863fb1dcbffe3ff2de638d60ba947f (diff) | |
| parent | daa243e6f429053fac697ff406bdf916c50de807 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
3 files changed, 9 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index ef9b48d5a5..fcdc945b2e 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -182,6 +182,8 @@ namespace MediaBrowser.Api.Playback.Progressive return ToStaticFileResult(outputPath, isHeadRequest); } + Response.AddHeader("Accept-Ranges", "none"); + return GetStreamResult(state, isHeadRequest).Result; } diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 40c91979db..0c8646508f 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -381,6 +381,7 @@ namespace MediaBrowser.Common.Implementations if (disposable != null) { Logger.Info("Registering " + disposable.GetType().Name); + DisposableParts.Add(disposable); } } @@ -458,7 +459,10 @@ namespace MediaBrowser.Common.Implementations if (manageLiftime) { - DisposableParts.AddRange(parts.OfType<IDisposable>()); + lock (DisposableParts) + { + DisposableParts.AddRange(parts.OfType<IDisposable>()); + } } return parts; diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 04ebf3a8d1..02d8eb16ff 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -300,13 +300,13 @@ namespace MediaBrowser.Controller.Library { var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml(); - if (fields.Contains(ItemFields.Overview)) + if (hasOverview) { dto.Overview = strippedOverview; } // Only supply the html version if there was actually html content - if (fields.Contains(ItemFields.OverviewHtml) && !string.Equals(item.Overview, strippedOverview)) + if (hasHtmlOverview) { dto.OverviewHtml = item.Overview; } |