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

update http server

Browse Source
This commit is contained in:
Luke Pulverenti 2014-10-22 01:06:19 -04:00
parent 9f3891d418
commit 35f40993b2
4 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
View File

@ -12,8 +12,6 @@ namespace MediaBrowser.Dlna.Profiles
Name = "Xbox One";
TimelineOffsetSeconds = 40;
RequiresPlainFolders = true;
RequiresPlainVideoItems = true;
Identification = new DeviceIdentification
{

4
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -205,8 +205,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
HostContext.Config.HandlerFactoryPath = ListenerRequest.GetHandlerPathIfAny(UrlPrefixes.First());
_listener = _supportsNativeWebSocket && NativeWebSocket.IsSupported
? _listener = new HttpListenerServer(_logger, OnRequestReceived)
//? _listener = new WebSocketSharpListener(_logger, OnRequestReceived)
//? _listener = new HttpListenerServer(_logger, OnRequestReceived)
? _listener = new WebSocketSharpListener(_logger, OnRequestReceived)
: _listener = new WebSocketSharpListener(_logger, OnRequestReceived);
_listener.WebSocketHandler = WebSocketHandler;

59
MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
View File

@ -173,9 +173,64 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ThrottleCallback = ThrottleCallback
};
}
var task = WriteToAsync(responseStream);
WriteToInternal(responseStream);
}
Task.WaitAll(task);
/// <summary>
/// Writes to async.
/// </summary>
/// <param name="responseStream">The response stream.</param>
/// <returns>Task.</returns>
private void WriteToInternal(Stream responseStream)
{
try
{
// Headers only
if (IsHeadRequest)
{
return;
}
using (var source = SourceStream)
{
// If the requested range is "0-", we can optimize by just doing a stream copy
if (RangeEnd >= TotalContentLength - 1)
{
source.CopyTo(responseStream);
}
else
{
CopyToInternal(source, responseStream, Convert.ToInt32(RangeLength));
}
}
}
finally
{
if (OnComplete != null)
{
OnComplete();
}
}
}
private void CopyToInternal(Stream source, Stream destination, int copyLength)
{
const int bufferSize = 81920;
var array = new byte[bufferSize];
int count;
while ((count = source.Read(array, 0, array.Length)) != 0)
{
var bytesToCopy = Math.Min(count, copyLength);
destination.Write(array, 0, bytesToCopy);
copyLength -= bytesToCopy;
if (copyLength <= 0)
{
break;
}
}
}
/// <summary>

8
MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs
View File

@ -91,9 +91,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ThrottleCallback = ThrottleCallback
};
}
var task = WriteToAsync(responseStream);
Task.WaitAll(task);
WriteToAsync(responseStream);
}
/// <summary>
@ -101,13 +99,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// </summary>
/// <param name="responseStream">The response stream.</param>
/// <returns>Task.</returns>
private async Task WriteToAsync(Stream responseStream)
private void WriteToAsync(Stream responseStream)
{
try
{
using (var src = SourceStream)
{
await src.CopyToAsync(responseStream).ConfigureAwait(false);
src.CopyTo(responseStream);
}
}
catch (Exception ex)