open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2284 from MediaBrowser/dev

Browse Source 
Dev
pull/702/head
Luke 8 years ago committed by GitHub
parent fc6184b159 102bbe2beb
commit 6cbebfcc4e
10 changed files with 93 additions and 68 deletions
Show Stats Download Patch File Download Diff File

3
Emby.Server.Core/ApplicationHost.cs
Unescape View File

@ -1136,9 +1136,6 @@ namespace Emby.Server.Core
{ {
get get
{ {
#if DEBUG
return false;
#endif
#pragma warning disable 162 #pragma warning disable 162
return NativeApp.CanSelfUpdate; return NativeApp.CanSelfUpdate;
#pragma warning restore 162 #pragma warning restore 162

7
Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
Unescape View File

@ -100,7 +100,12 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
{ {
var outputStream = response.OutputStream; var outputStream = response.OutputStream;
outputStream.Flush(); // This is needed with compression
//if (!string.IsNullOrWhiteSpace(GetHeader("Content-Encoding")))
{
outputStream.Flush();
}
outputStream.Dispose(); outputStream.Dispose();
response.Close(); response.Close();
} }

44
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
Unescape View File

@ -115,6 +115,34 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\BDInfo\BDInfo.csproj">
<Project>{88ae38df-19d7-406f-a6a9-09527719a21e}</Project>
<Name>BDInfo</Name>
</ProjectReference>
<ProjectReference Include="..\DvdLib\DvdLib.csproj">
<Project>{713f42b5-878e-499d-a878-e4c652b1d5e8}</Project>
<Name>DvdLib</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj">
<Project>{805844ab-e92f-45e6-9d99-4f6d48d129a5}</Project>
<Name>Emby.Dlna</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Drawing.ImageMagick\Emby.Drawing.ImageMagick.csproj">
<Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project>
<Name>Emby.Drawing.ImageMagick</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Drawing.Net\Emby.Drawing.Net.csproj">
<Project>{c97a239e-a96c-4d64-a844-ccf8cc30aecb}</Project>
<Name>Emby.Drawing.Net</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj">
<Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project>
<Name>Emby.Drawing</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj">
<Project>{89ab4548-770d-41fd-a891-8daff44f452c}</Project>
<Name>Emby.Photos</Name>
</ProjectReference>
<ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj"> <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
<Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project> <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
<Name>Emby.Server.Implementations</Name> <Name>Emby.Server.Implementations</Name>
@ -163,6 +191,22 @@
<Project>{23499896-B135-4527-8574-C26E926EA99E}</Project> <Project>{23499896-B135-4527-8574-C26E926EA99E}</Project>
<Name>MediaBrowser.XbmcMetadata</Name> <Name>MediaBrowser.XbmcMetadata</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj">
<Project>{4a4402d4-e910-443b-b8fc-2c18286a2ca0}</Project>
<Name>OpenSubtitlesHandler</Name>
</ProjectReference>
<ProjectReference Include="..\RSSDP\RSSDP.csproj">
<Project>{21002819-c39a-4d3e-be83-2a276a77fb1f}</Project>
<Name>RSSDP</Name>
</ProjectReference>
<ProjectReference Include="..\ServiceStack\ServiceStack.csproj">
<Project>{680a1709-25eb-4d52-a87f-ee03ffd94baa}</Project>
<Name>ServiceStack</Name>
</ProjectReference>
<ProjectReference Include="..\SocketHttpListener.Portable\SocketHttpListener.Portable.csproj">
<Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project>
<Name>SocketHttpListener.Portable</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib"> <None Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">

4
MediaBrowser.ServerApplication/MainStartup.cs
Unescape View File

@ -291,6 +291,10 @@ namespace MediaBrowser.ServerApplication
{ {
get get
{ {
#if DEBUG
return false;
#endif
if (_isRunningAsService) if (_isRunningAsService)
{ {
return _canRestartService; return _canRestartService;

36
ServiceStack/Host/RestHandler.cs
Unescape View File

@ -23,32 +23,13 @@ namespace ServiceStack.Host
var taskResult = ServiceStackHost.Instance.GetTaskResult(taskResponse, RequestName); var taskResult = ServiceStackHost.Instance.GetTaskResult(taskResponse, RequestName);
var taskResults = taskResult as Task[]; var subTask = taskResult as Task;
if (subTask != null)
if (taskResults == null)
{
var subTask = taskResult as Task;
if (subTask != null)
taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
return taskResult;
}
if (taskResults.Length == 0)
{ {
return new object[] { }; taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
} }
var firstResponse = ServiceStackHost.Instance.GetTaskResult(taskResults[0], RequestName); return taskResult;
var batchedResponses = firstResponse != null
? (object[])Array.CreateInstance(firstResponse.GetType(), taskResults.Length)
: new object[taskResults.Length];
batchedResponses[0] = firstResponse;
for (var i = 1; i < taskResults.Length; i++)
{
batchedResponses[i] = ServiceStackHost.Instance.GetTaskResult(taskResults[i], RequestName);
}
return batchedResponses;
} }
protected static object CreateContentTypeRequest(IRequest httpReq, Type requestType, string contentType) protected static object CreateContentTypeRequest(IRequest httpReq, Type requestType, string contentType)
@ -141,18 +122,13 @@ namespace ServiceStack.Host
var request = httpReq.Dto = CreateRequest(httpReq, restPath); var request = httpReq.Dto = CreateRequest(httpReq, restPath);
if (appHost.ApplyRequestFilters(httpReq, httpRes, request)) appHost.ApplyRequestFilters(httpReq, httpRes, request);
return;
var rawResponse = await ServiceStackHost.Instance.ServiceController.Execute(request, httpReq).ConfigureAwait(false); var rawResponse = await ServiceStackHost.Instance.ServiceController.Execute(request, httpReq).ConfigureAwait(false);
if (httpRes.IsClosed)
return;
var response = await HandleResponseAsync(rawResponse).ConfigureAwait(false); var response = await HandleResponseAsync(rawResponse).ConfigureAwait(false);
if (appHost.ApplyResponseFilters(httpReq, httpRes, response)) appHost.ApplyResponseFilters(httpReq, httpRes, response);
return;
await httpRes.WriteToResponse(httpReq, response).ConfigureAwait(false); await httpRes.WriteToResponse(httpReq, response).ConfigureAwait(false);
} }

21
ServiceStack/ServiceStackHost.Runtime.cs
Unescape View File

@ -14,10 +14,8 @@ namespace ServiceStack
/// and no more processing should be done. /// and no more processing should be done.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public virtual bool ApplyRequestFilters(IRequest req, IResponse res, object requestDto) public virtual void ApplyRequestFilters(IRequest req, IResponse res, object requestDto)
{ {
if (res.IsClosed) return res.IsClosed;
//Exec all RequestFilter attributes with Priority < 0 //Exec all RequestFilter attributes with Priority < 0
var attributes = FilterAttributeCache.GetRequestFilterAttributes(requestDto.GetType()); var attributes = FilterAttributeCache.GetRequestFilterAttributes(requestDto.GetType());
var i = 0; var i = 0;
@ -25,16 +23,12 @@ namespace ServiceStack
{ {
var attribute = attributes[i]; var attribute = attributes[i];
attribute.RequestFilter(req, res, requestDto); attribute.RequestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
} }
if (res.IsClosed) return res.IsClosed;
//Exec global filters //Exec global filters
foreach (var requestFilter in GlobalRequestFilters) foreach (var requestFilter in GlobalRequestFilters)
{ {
requestFilter(req, res, requestDto); requestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
} }
//Exec remaining RequestFilter attributes with Priority >= 0 //Exec remaining RequestFilter attributes with Priority >= 0
@ -42,10 +36,7 @@ namespace ServiceStack
{ {
var attribute = attributes[i]; var attribute = attributes[i];
attribute.RequestFilter(req, res, requestDto); attribute.RequestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
} }
return res.IsClosed;
} }
/// <summary> /// <summary>
@ -53,21 +44,13 @@ namespace ServiceStack
/// and no more processing should be done. /// and no more processing should be done.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public virtual bool ApplyResponseFilters(IRequest req, IResponse res, object response) public virtual void ApplyResponseFilters(IRequest req, IResponse res, object response)
{ {
if (response != null)
{
if (res.IsClosed) return res.IsClosed;
}
//Exec global filters //Exec global filters
foreach (var responseFilter in GlobalResponseFilters) foreach (var responseFilter in GlobalResponseFilters)
{ {
responseFilter(req, res, response); responseFilter(req, res, response);
if (res.IsClosed) return res.IsClosed;
} }
return res.IsClosed;
} }
} }

19
SocketHttpListener.Portable/Net/HttpConnection.cs
Unescape View File

@ -23,7 +23,7 @@ namespace SocketHttpListener.Net
StringBuilder current_line; StringBuilder current_line;
ListenerPrefix prefix; ListenerPrefix prefix;
RequestStream i_stream; RequestStream i_stream;
ResponseStream o_stream; Stream o_stream;
bool chunked; bool chunked;
int reuses; int reuses;
bool context_bound; bool context_bound;
@ -204,12 +204,23 @@ namespace SocketHttpListener.Net
return i_stream; return i_stream;
} }
public ResponseStream GetResponseStream() public Stream GetResponseStream(HttpListenerRequest request)
{ {
// TODO: can we get this stream before reading the input? // TODO: can we get this stream before reading the input?
if (o_stream == null) if (o_stream == null)
{ {
o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding); if (context.Response.SendChunked || request == null || request.HasExpect100Continue)
{
o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
}
else
{
o_stream = stream;
using (var headerStream = ResponseStream.GetHeaders(context.Response, _memoryStreamFactory, false))
{
headerStream.CopyTo(o_stream);
}
}
} }
return o_stream; return o_stream;
} }
@ -479,7 +490,7 @@ namespace SocketHttpListener.Net
{ {
if (!context.Request.IsWebSocketRequest || force_close) if (!context.Request.IsWebSocketRequest || force_close)
{ {
Stream st = GetResponseStream(); Stream st = GetResponseStream(context.Request);
if (st != null) if (st != null)
st.Dispose(); st.Dispose();

11
SocketHttpListener.Portable/Net/HttpListenerRequest.cs
Unescape View File

@ -179,16 +179,21 @@ namespace SocketHttpListener.Net
} }
} }
if (String.Compare(Headers["Expect"], "100-continue", StringComparison.OrdinalIgnoreCase) == 0) if (HasExpect100Continue)
{ {
ResponseStream output = context.Connection.GetResponseStream(); var output = (ResponseStream)context.Connection.GetResponseStream(this);
var _100continue = _textEncoding.GetASCIIEncoding().GetBytes("HTTP/1.1 100 Continue\r\n\r\n"); var _100continue = _textEncoding.GetASCIIEncoding().GetBytes("HTTP/1.1 100 Continue\r\n\r\n");
output.InternalWrite(_100continue, 0, _100continue.Length); output.InternalWrite(_100continue, 0, _100continue.Length);
} }
} }
public bool HasExpect100Continue
{
get { return String.Compare(Headers["Expect"], "100-continue", StringComparison.OrdinalIgnoreCase) == 0; }
}
static bool MaybeUri(string s) static bool MaybeUri(string s)
{ {
int p = s.IndexOf(':'); int p = s.IndexOf(':');

6
SocketHttpListener.Portable/Net/HttpListenerResponse.cs
Unescape View File

@ -19,7 +19,7 @@ namespace SocketHttpListener.Net
CookieCollection cookies; CookieCollection cookies;
WebHeaderCollection headers = new WebHeaderCollection(); WebHeaderCollection headers = new WebHeaderCollection();
bool keep_alive = true; bool keep_alive = true;
ResponseStream output_stream; Stream output_stream;
Version version = HttpVersion.Version11; Version version = HttpVersion.Version11;
string location; string location;
int status_code = 200; int status_code = 200;
@ -149,7 +149,7 @@ namespace SocketHttpListener.Net
get get
{ {
if (output_stream == null) if (output_stream == null)
output_stream = context.Connection.GetResponseStream(); output_stream = context.Connection.GetResponseStream(context.Request);
return output_stream; return output_stream;
} }
} }
@ -489,7 +489,7 @@ namespace SocketHttpListener.Net
int preamble = encoding.GetPreamble().Length; int preamble = encoding.GetPreamble().Length;
if (output_stream == null) if (output_stream == null)
output_stream = context.Connection.GetResponseStream(); output_stream = context.Connection.GetResponseStream(context.Request);
/* Assumes that the ms was at position 0 */ /* Assumes that the ms was at position 0 */
ms.Position = preamble; ms.Position = preamble;

10
SocketHttpListener.Portable/Net/ResponseStream.cs
Unescape View File

@ -64,7 +64,7 @@ namespace SocketHttpListener.Net
{ {
disposed = true; disposed = true;
byte[] bytes = null; byte[] bytes = null;
MemoryStream ms = GetHeaders(true); MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
bool chunked = response.SendChunked; bool chunked = response.SendChunked;
if (stream.CanWrite) if (stream.CanWrite)
{ {
@ -102,14 +102,14 @@ namespace SocketHttpListener.Net
base.Dispose(disposing); base.Dispose(disposing);
} }
MemoryStream GetHeaders(bool closing) internal static MemoryStream GetHeaders(HttpListenerResponse response, IMemoryStreamFactory memoryStreamFactory, bool closing)
{ {
// SendHeaders works on shared headers // SendHeaders works on shared headers
lock (response.headers_lock) lock (response.headers_lock)
{ {
if (response.HeadersSent) if (response.HeadersSent)
return null; return null;
MemoryStream ms = _memoryStreamFactory.CreateNew(); MemoryStream ms = memoryStreamFactory.CreateNew();
response.SendHeaders(closing, ms); response.SendHeaders(closing, ms);
return ms; return ms;
} }
@ -137,7 +137,7 @@ namespace SocketHttpListener.Net
throw new ObjectDisposedException(GetType().ToString()); throw new ObjectDisposedException(GetType().ToString());
byte[] bytes = null; byte[] bytes = null;
MemoryStream ms = GetHeaders(false); MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
bool chunked = response.SendChunked; bool chunked = response.SendChunked;
if (ms != null) if (ms != null)
{ {
@ -177,7 +177,7 @@ namespace SocketHttpListener.Net
throw new ObjectDisposedException(GetType().ToString()); throw new ObjectDisposedException(GetType().ToString());
byte[] bytes = null; byte[] bytes = null;
MemoryStream ms = GetHeaders(false); MemoryStream ms = GetHeaders(response, _memoryStreamFactory, false);
bool chunked = response.SendChunked; bool chunked = response.SendChunked;
if (ms != null) if (ms != null)
{ {

Write Preview
Loading…
Cancel
Save