diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-02-16 03:22:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 03:22:12 +0300 |
| commit | b7ae044e653859b9190783e38e720d5c13a13098 (patch) | |
| tree | d7ab62a67bc7b45c73d98418b7edee05b7818ad1 /Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs | |
| parent | 7cc69f30c4519db4162acfbc4d056ae34e6ca6ef (diff) | |
| parent | 18e1d03a89b7fe3ddba925f81b153d0f0cd1973c (diff) | |
Merge pull request #885 from Bond-009/warn
More warning fixes
Diffstat (limited to 'Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs')
| -rw-r--r-- | Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs index cabc96b23..56e5c73d6 100644 --- a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs +++ b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs @@ -13,12 +13,12 @@ using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse; using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse; using IRequest = MediaBrowser.Model.Services.IRequest; - namespace Jellyfin.Server.SocketSharp { public class WebSocketSharpResponse : IHttpResponse { private readonly ILogger _logger; + private readonly HttpListenerResponse _response; public WebSocketSharpResponse(ILogger logger, HttpListenerResponse response, IRequest request) @@ -30,7 +30,9 @@ namespace Jellyfin.Server.SocketSharp } public IRequest Request { get; private set; } + public Dictionary<string, object> Items { get; private set; } + public object OriginalResponse => _response; public int StatusCode @@ -51,7 +53,7 @@ namespace Jellyfin.Server.SocketSharp set => _response.ContentType = value; } - //public ICookies Cookies { get; set; } + public QueryParamCollection Headers => _response.Headers; public void AddHeader(string name, string value) { @@ -64,8 +66,6 @@ namespace Jellyfin.Server.SocketSharp _response.AddHeader(name, value); } - public QueryParamCollection Headers => _response.Headers; - public string GetHeader(string name) { return _response.Headers[name]; @@ -114,9 +114,9 @@ namespace Jellyfin.Server.SocketSharp public void SetContentLength(long contentLength) { - //you can happily set the Content-Length header in Asp.Net - //but HttpListener will complain if you do - you have to set ContentLength64 on the response. - //workaround: HttpListener throws "The parameter is incorrect" exceptions when we try to set the Content-Length header + // you can happily set the Content-Length header in Asp.Net + // but HttpListener will complain if you do - you have to set ContentLength64 on the response. + // workaround: HttpListener throws "The parameter is incorrect" exceptions when we try to set the Content-Length header _response.ContentLength64 = contentLength; } @@ -147,15 +147,12 @@ namespace Jellyfin.Server.SocketSharp { sb.Append($";domain={cookie.Domain}"); } - //else if (restrictAllCookiesToDomain != null) - //{ - // sb.Append($";domain={restrictAllCookiesToDomain}"); - //} if (cookie.Secure) { sb.Append(";Secure"); } + if (cookie.HttpOnly) { sb.Append(";HttpOnly"); @@ -164,7 +161,6 @@ namespace Jellyfin.Server.SocketSharp return sb.ToString(); } - public bool SendChunked { get => _response.SendChunked; |
