diff --git a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
index 227bd954ab..8c9815134a 100644
--- a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Playback
{
using (var remoteStream = await _msg.Content.ReadAsStreamAsync().ConfigureAwait(false))
{
- await remoteStream.CopyToAsync(responseStream, 8192000).ConfigureAwait(false);
+ await remoteStream.CopyToAsync(responseStream, 819200).ConfigureAwait(false);
}
}
}
diff --git a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
index 9986f90ec0..1d88496480 100644
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@@ -67,12 +67,15 @@ namespace MediaBrowser.Model.Querying
/// The sort by.
public string[] SortBy { get; set; }
+ public ImageType[] ImageTypes { get; set; }
+
///
/// Initializes a new instance of the class.
///
public ItemsByNameQuery()
{
- Fields = new ItemFields[] {};
+ ImageTypes = new ImageType[] { };
+ Fields = new ItemFields[] { };
Recursive = true;
MediaTypes = new string[] { };
SortBy = new string[] { };
diff --git a/MediaBrowser.Model/Querying/PersonsQuery.cs b/MediaBrowser.Model/Querying/PersonsQuery.cs
index a4b7eab712..a859ece1f1 100644
--- a/MediaBrowser.Model/Querying/PersonsQuery.cs
+++ b/MediaBrowser.Model/Querying/PersonsQuery.cs
@@ -1,4 +1,5 @@
-
+using MediaBrowser.Model.Entities;
+
namespace MediaBrowser.Model.Querying
{
///
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index e605a5daa7..959ec44c8b 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -72,7 +72,13 @@ namespace MediaBrowser.Model.System
///
/// The program data path.
public string ProgramDataPath { get; set; }
-
+
+ ///
+ /// Gets or sets the HTTP server port number.
+ ///
+ /// The HTTP server port number.
+ public int HttpServerPortNumber { get; set; }
+
///
/// Initializes a new instance of the class.
///
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index 59217bc17d..089b8a5055 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -219,7 +219,7 @@ namespace MediaBrowser.Server.Implementations.Providers
}
catch (Exception ex)
{
- _logger.ErrorException("{0} failed refreshing {1}", ex, provider.GetType().Name, item.Name);
+ _logger.ErrorException("{0} failed refreshing {1} {2}", ex, provider.GetType().Name, item.Name, item.Path ?? string.Empty);
provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure);
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 3612b85b95..4bab10ee09 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -132,10 +132,17 @@ namespace MediaBrowser.Server.Implementations.ServerManager
{
LastActivityDate = DateTime.UtcNow;
+ if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
+ {
+ _logger.Error("Received web socket message that is not a json structure: " + message);
+ return;
+ }
+
if (OnReceive == null)
{
return;
}
+
try
{
var stub = (WebSocketMessage