aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-12 02:14:04 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-12 02:14:04 -0500
commita855864207fe3ed0ac9b4d648617bb1cb39df3f3 (patch)
treeec53ae5d97f8a12b2cbaeeaaf1066b976376f72d /Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
parentc035f2baa1f3537d298a6559d15bd7ca40188e5d (diff)
limit access to response stream
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/HttpListenerHost.cs')
-rw-r--r--Emby.Server.Implementations/HttpServer/HttpListenerHost.cs22
1 files changed, 15 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 49c664eec..41b7a4622 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
+using System.Text;
using System.Threading.Tasks;
using Emby.Server.Implementations.HttpServer;
using Emby.Server.Implementations.HttpServer.SocketSharp;
@@ -248,9 +249,7 @@ namespace Emby.Server.Implementations.HttpServer
httpRes.StatusCode = statusCode;
httpRes.ContentType = "text/html";
- httpRes.Write(ex.Message);
-
- httpRes.Close();
+ Write(httpRes, ex.Message);
}
catch
{
@@ -404,7 +403,7 @@ namespace Emby.Server.Implementations.HttpServer
{
httpRes.StatusCode = 400;
httpRes.ContentType = "text/plain";
- httpRes.Write("Invalid host");
+ Write(httpRes, "Invalid host");
return;
}
@@ -458,7 +457,7 @@ namespace Emby.Server.Implementations.HttpServer
if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
{
- httpRes.Write(
+ Write(httpRes,
"<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
newUrl + "\">" + newUrl + "</a></body></html>");
return;
@@ -475,7 +474,7 @@ namespace Emby.Server.Implementations.HttpServer
if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
{
- httpRes.Write(
+ Write(httpRes,
"<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
newUrl + "\">" + newUrl + "</a></body></html>");
return;
@@ -513,7 +512,7 @@ namespace Emby.Server.Implementations.HttpServer
{
httpRes.StatusCode = 503;
httpRes.ContentType = "text/html";
- httpRes.Write(GlobalResponse);
+ Write(httpRes, GlobalResponse);
return;
}
@@ -547,6 +546,15 @@ namespace Emby.Server.Implementations.HttpServer
}
}
+ private void Write(IResponse response, string text)
+ {
+ var bOutput = Encoding.UTF8.GetBytes(text);
+ response.SetContentLength(bOutput.Length);
+
+ var outputStream = response.OutputStream;
+ outputStream.Write(bOutput, 0, bOutput.Length);
+ }
+
public static void RedirectToUrl(IResponse httpRes, string url)
{
httpRes.StatusCode = 302;