cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

More warnings

Browse Source
This commit is contained in:
Bond-009 2019-02-13 17:28:04 +01:00
parent 892787cb1a
commit 46897aab4f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Server/SocketSharp/RequestMono.cs
View File

@ -431,13 +431,13 @@ namespace Jellyfin.Server.SocketSharp
real = position + d; real = position + d;
break; break;
default: default:
throw new ArgumentException(nameof(origin)); throw new ArgumentException("Unknown SeekOrigin value", nameof(origin));
} }
long virt = real - offset; long virt = real - offset;
if (virt < 0 || virt > Length) if (virt < 0 || virt > Length)
{ {
throw new ArgumentException(); throw new ArgumentException("Invalid position", nameof(origin));
} }
position = s.Seek(real, SeekOrigin.Begin); position = s.Seek(real, SeekOrigin.Begin);
@ -572,11 +572,6 @@ namespace Jellyfin.Server.SocketSharp
public HttpMultipart(Stream data, string b, Encoding encoding) public HttpMultipart(Stream data, string b, Encoding encoding)
{ {
this.data = data; this.data = data;
// DB: 30/01/11: cannot set or read the Position in HttpListener in Win.NET
// var ms = new MemoryStream(32 * 1024);
// data.CopyTo(ms);
// this.data = ms;
boundary = b; boundary = b;
boundary_bytes = encoding.GetBytes(b); boundary_bytes = encoding.GetBytes(b);
buffer = new byte[boundary_bytes.Length + 2]; // CRLF or '--' buffer = new byte[boundary_bytes.Length + 2]; // CRLF or '--'

7
Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using Emby.Server.Implementations.HttpServer; using Emby.Server.Implementations.HttpServer;
@ -69,9 +70,11 @@ namespace Jellyfin.Server.SocketSharp
public string UserHostAddress => request.UserHostAddress; public string UserHostAddress => request.UserHostAddress;
public string XForwardedFor => string.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"]; public string XForwardedFor
=> string.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
public int? XForwardedPort => string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]); public int? XForwardedPort
=> string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"], CultureInfo.InvariantCulture);
public string XForwardedProtocol => string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"]; public string XForwardedProtocol => string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];