Merging in latest dev

2 files changed, 1 insertions, 13 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
index 3903c62b1..b4da40702 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -140,7 +140,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                 return true;
             }
 
-            return _config.Configuration.InsecureApps8.Contains(auth.Client ?? string.Empty,
+            return _config.Configuration.InsecureApps9.Contains(auth.Client ?? string.Empty,
                 StringComparer.OrdinalIgnoreCase);
         }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ThrottledStream.cs b/MediaBrowser.Server.Implementations/HttpServer/ThrottledStream.cs
index 4bde30dac..1c01fa9e0 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ThrottledStream.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ThrottledStream.cs
@@ -15,8 +15,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// </summary>
         public const long Infinite = 0;
 
-        public Func<long, long, long> ThrottleCallback { get; set; }
-        
         #region Private members
         /// <summary>
         /// The base stream.
@@ -293,16 +291,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 return false;
             }
 
-            if (ThrottleCallback != null)
-            {
-                var val = ThrottleCallback(_maximumBytesPerSecond, _bytesWritten);
-
-                if (val == 0)
-                {
-                    return false;
-                }
-            }
-
             return true;
         }