2 files changed, 17 insertions, 22 deletions

diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 84f495efa8..1eaf4acb1b 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
 using ServiceStack;
 using System;
 using System.Linq;
@@ -94,8 +93,8 @@ namespace MediaBrowser.Api
         {
             var item = _dtoService.GetItemByDtoId(request.ItemId);
 
-            var newEnableInternetProviders = request.EnableInternetProviders ?? true;
-            var dontFetchMetaChanged = item.DontFetchMeta != !newEnableInternetProviders;
+            var newLockData = request.LockData ?? false;
+            var dontFetchMetaChanged = item.DontFetchMeta != newLockData;
 
             UpdateItem(request, item);
 
@@ -107,7 +106,7 @@ namespace MediaBrowser.Api
 
                 foreach (var child in folder.RecursiveChildren.ToList())
                 {
-                    child.DontFetchMeta = !newEnableInternetProviders;
+                    child.DontFetchMeta = newLockData;
                     await _libraryManager.UpdateItem(child, ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
                 }
             }
@@ -307,16 +306,13 @@ namespace MediaBrowser.Api
             {
                 hasAspectRatio.AspectRatio = request.AspectRatio;
             }
-            
-            item.DontFetchMeta = !(request.EnableInternetProviders ?? true);
-            if (request.EnableInternetProviders ?? true)
+
+            item.DontFetchMeta = (request.LockData ?? false);
+
+            if (request.LockedFields != null)
             {
                 item.LockedFields = request.LockedFields;
             }
-            else
-            {
-                item.LockedFields.Clear();
-            }
 
             // Only allow this for series. Runtimes for media comes from ffprobe.
             if (item is Series)
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index 0d03e79859..09b87bce9a 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -9,7 +9,6 @@ using MediaBrowser.Controller.MediaInfo;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
-using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -241,6 +240,13 @@ namespace MediaBrowser.Api.Playback.Progressive
 
             responseHeaders["Accept-Ranges"] = "none";
 
+            var length = response.Headers["Content-Length"];
+
+            if (!string.IsNullOrEmpty(length))
+            {
+                responseHeaders["Content-Length"] = length;
+            }
+
             if (isHeadRequest)
             {
                 using (response.Content)
@@ -274,20 +280,14 @@ namespace MediaBrowser.Api.Playback.Progressive
             // Use the command line args with a dummy playlist path
             var outputPath = GetOutputFilePath(state);
 
+            responseHeaders["Accept-Ranges"] = "none";
+
             var contentType = MimeTypes.GetMimeType(outputPath);
 
             // Headers only
             if (isHeadRequest)
             {
-                responseHeaders["Accept-Ranges"] = "none";
-
-                var value = ResultFactory.GetResult(new byte[]{}, contentType, responseHeaders);
-                if (value as IHasOptions != null)
-                {
-                    if (((IHasOptions)value).Options.ContainsKey("Content-Length"))
-                        ((IHasOptions)value).Options.Remove("Content-Length"); 
-                }
-                return value;
+                return ResultFactory.GetResult(new byte[] { }, contentType, responseHeaders);
             }
 
             if (!File.Exists(outputPath))
@@ -301,7 +301,6 @@ namespace MediaBrowser.Api.Playback.Progressive
 
             var result = new ProgressiveStreamWriter(outputPath, Logger, FileSystem);
 
-            result.Options["Accept-Ranges"] = "none";
             result.Options["Content-Type"] = contentType;
 
             // Add the response headers to the result object