mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-26 20:16:33 +00:00
Merge
This commit is contained in:
@@ -21,6 +21,11 @@ namespace MediaBrowser.Common.Logging
|
||||
LoggerInstance.LogError(message, paramList);
|
||||
}
|
||||
|
||||
public static void LogException(Exception ex, params object[] paramList)
|
||||
{
|
||||
LogException(string.Empty, ex, paramList);
|
||||
}
|
||||
|
||||
public static void LogException(string message, Exception ex, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogException(message, ex, paramList);
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace MediaBrowser.Common.Net.Handlers
|
||||
/// <summary>
|
||||
/// The original HttpListenerContext
|
||||
/// </summary>
|
||||
protected HttpListenerContext HttpListenerContext { get; private set; }
|
||||
protected HttpListenerContext HttpListenerContext { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The original QueryString
|
||||
@@ -196,7 +196,7 @@ namespace MediaBrowser.Common.Net.Handlers
|
||||
}
|
||||
}
|
||||
|
||||
public void ProcessRequest(HttpListenerContext ctx)
|
||||
public virtual void ProcessRequest(HttpListenerContext ctx)
|
||||
{
|
||||
HttpListenerContext = ctx;
|
||||
|
||||
|
||||
@@ -10,12 +10,22 @@ namespace MediaBrowser.Common.Net.Handlers
|
||||
{
|
||||
public class StaticFileHandler : BaseHandler
|
||||
{
|
||||
private string _Path;
|
||||
public virtual string Path
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(_Path))
|
||||
{
|
||||
return _Path;
|
||||
}
|
||||
|
||||
return QueryString["path"];
|
||||
}
|
||||
set
|
||||
{
|
||||
_Path = value;
|
||||
}
|
||||
}
|
||||
|
||||
private bool FileStreamDiscovered = false;
|
||||
|
||||
Reference in New Issue
Block a user