Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Granicus.MediaManager.UserSDK/MediaManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,17 @@ private string m_SafeServerURL(string Server)
{
if (!Server.StartsWith("https://") && !Server.StartsWith("http://"))
{
Server = "https://" + Server;
} else if(Server.StartsWith("http://") && !Server.Contains("mm.lvh.me")) {
Server = Server.Replace("http://","https://");
string serverHost = Server.Split(':')[0]; // Remove port if present
System.Net.IPAddress ipAddress;
bool isIp = System.Net.IPAddress.TryParse(serverHost, out ipAddress);
if (isIp)
{
Server = "http://" + Server;
}
else
{
Server = "https://" + Server;
}
}
if (!Server.EndsWith("/"))
{
Expand Down
13 changes: 11 additions & 2 deletions Granicus.MediaManager.UserSDK/MediaVault.cs
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,18 @@ protected override WebRequest GetWebRequest(Uri uri)
/// <returns></returns>
private string m_SafeServerURL(ServerInterfaceData Server)
{
if (!Server.Host.StartsWith("http://"))
if (!Server.Host.StartsWith("http://") && !Server.Host.StartsWith("https://"))
{
Server.Host = "http://" + Server.Host;
System.Net.IPAddress ipAddress;
bool isIp = System.Net.IPAddress.TryParse(Server.Host, out ipAddress);
if (isIp)
{
Server.Host = "http://" + Server.Host;
}
else
{
Server.Host = "https://" + Server.Host;
}
}
if (Server.Host.EndsWith("/"))
{
Expand Down