alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source 
Conflicts:
	SharedVersion.cs
This commit is contained in:
Luke Pulverenti
2014-12-01 13:42:07 -05:00
parent dc8fb33a1f cbf1bca2ea
commit c48458f215
22 changed files with 176 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
View File

@@ -135,7 +135,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
request.Referer = options.Referer;
}
request.ServicePoint.BindIPEndPointDelegate = BindIPEndPointCallback;
//request.ServicePoint.BindIPEndPointDelegate = BindIPEndPointCallback;
return request;
}

2
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
View File

@@ -17,7 +17,7 @@ namespace MediaBrowser.Common.Implementations.Security
/// </summary>
public class PluginSecurityManager : ISecurityManager
{
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
private const string MBValidateUrl = MbAdminUrl + "service/registration/validate";

2
MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
View File

@@ -172,7 +172,7 @@ namespace MediaBrowser.Common.Implementations.Updates
}
private Tuple<List<PackageInfo>, DateTime> _lastPackageListResult;
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
/// <summary>
/// Gets all available packages.