Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

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;
         }
 

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;

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;
                 }