aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Net
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-10 23:14:52 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-10 23:14:52 -0400
commit3919cab092aee4c2df283c398690a6d2b60cded7 (patch)
tree89bb96187497236ff9894f8fbb091710ddaf46a2 /MediaBrowser.Common/Net
parent3d7b637a23310583e4dab1d67feb366d727b1829 (diff)
parentbda2c81dab2a1df11ba853a34e047a5be41e0827 (diff)
Merge
Diffstat (limited to 'MediaBrowser.Common/Net')
-rw-r--r--MediaBrowser.Common/Net/Handlers/BaseHandler.cs4
-rw-r--r--MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs10
2 files changed, 12 insertions, 2 deletions
diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
index 5cb476e02..120d2ce7b 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
@@ -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;
diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
index 9bffd8e59..35d38fb4a 100644
--- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
@@ -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;