michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Start the webhost before RunStartupTasks and fix ContentEncoding

Browse Source
This commit is contained in:
Claus Vium 2019-03-03 13:54:14 +01:00
parent d450169964
commit 1cc433eabc
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
View File

@ -408,11 +408,28 @@ namespace Emby.Server.Implementations.SocketSharp
public string ContentType => request.ContentType;
private Encoding contentEncoding;
public Encoding ContentEncoding
private Encoding ContentEncoding
{
get => contentEncoding ?? Encoding.GetEncoding(request.Headers[HeaderNames.ContentEncoding].ToString());
set => contentEncoding = value;
get
{
// TODO is this necessary?
if (UserAgent != null && CultureInfo.InvariantCulture.CompareInfo.IsPrefix(UserAgent, "UP"))
{
string postDataCharset = Headers["x-up-devcap-post-charset"];
if (!string.IsNullOrEmpty(postDataCharset))
{
try
{
return Encoding.GetEncoding(postDataCharset);
}
catch (ArgumentException)
{
}
}
}
return request.GetTypedHeaders().ContentType.Encoding ?? Encoding.UTF8;
}
}
public Uri UrlReferrer => request.GetTypedHeaders().Referer;

1
Jellyfin.Server/Program.cs
View File

@ -144,7 +144,6 @@ namespace Jellyfin.Server
appHost.ImageProcessor.ImageEncoder = GetImageEncoder(fileSystem, appPaths, appHost.LocalizationManager);
await appHost.RunStartupTasks().ConfigureAwait(false);
appHost.Host.Run();
// TODO: read input for a stop command
try