lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-14 01:44:41 -05:00
commit 68d2add6d2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Mac/MacAppHost.cs
View File

@ -50,7 +50,7 @@ namespace MediaBrowser.Server.Mac
break; break;
} }
info.DownloadUrls = GetDownloadUrls(environment); info.DownloadUrls = GetDownloadUrls();
return info; return info;
} }
@ -72,7 +72,7 @@ namespace MediaBrowser.Server.Mac
protected override void RestartInternal() protected override void RestartInternal()
{ {
MainClass.Restart(StartupOptions); MainClass.Restart();
} }
protected override List<Assembly> GetAssembliesWithPartsInternal() protected override List<Assembly> GetAssembliesWithPartsInternal()

8
MediaBrowser.Server.Mac/Main.cs
View File

@ -1,5 +1,4 @@
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Mono.Native;
using MediaBrowser.Server.Startup.Common; using MediaBrowser.Server.Startup.Common;
using MediaBrowser.Server.Startup.Common.IO; using MediaBrowser.Server.Startup.Common.IO;
using MediaBrowser.Server.Implementations; using MediaBrowser.Server.Implementations;
@ -22,11 +21,13 @@ using MonoMac.Foundation;
using MonoMac.ObjCRuntime; using MonoMac.ObjCRuntime;
using Emby.Server.Core; using Emby.Server.Core;
using Emby.Common.Implementations.Logging; using Emby.Common.Implementations.Logging;
using Emby.Common.Implementations.EnvironmentInfo;
using Emby.Server.Mac.Native; using Emby.Server.Mac.Native;
using Emby.Server.Implementations.IO; using Emby.Server.Implementations.IO;
using Emby.Common.Implementations.Networking; using Emby.Common.Implementations.Networking;
using Emby.Common.Implementations.Security; using Emby.Common.Implementations.Security;
using Mono.Unix.Native; using Mono.Unix.Native;
using MediaBrowser.Model.System;
namespace MediaBrowser.Server.Mac namespace MediaBrowser.Server.Mac
{ {
@ -298,7 +299,10 @@ namespace MediaBrowser.Server.Mac
class NoCheckCertificatePolicy : ICertificatePolicy class NoCheckCertificatePolicy : ICertificatePolicy
{ {
public bool CheckValidationResult (ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem) public bool CheckValidationResult (ServicePoint srvPoint,
System.Security.Cryptography.X509Certificates.X509Certificate certificate,
WebRequest request,
int certificateProblem)
{ {
return true; return true;
} }