From 10cfb3c43c06e39b61929fea1d398801e555274b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 14 Feb 2015 14:36:40 -0500 Subject: sync updates --- .../Networking/BaseNetworkManager.cs | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'MediaBrowser.Common.Implementations') diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs index 6deda1293..1762ed575 100644 --- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs +++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs @@ -169,24 +169,27 @@ namespace MediaBrowser.Common.Implementations.Networking IPAddress address; if (resolveHost && !IPAddress.TryParse(endpoint, out address)) { - var host = new Uri(endpoint).DnsSafeHost; - - Logger.Debug("Resolving host {0}", host); - - try + Uri uri; + if (Uri.TryCreate(endpoint, UriKind.RelativeOrAbsolute, out uri)) { - address = GetIpAddresses(host).FirstOrDefault(); + var host = uri.DnsSafeHost; + Logger.Debug("Resolving host {0}", host); - if (address != null) + try { - Logger.Debug("{0} resolved to {1}", host, address); + address = GetIpAddresses(host).FirstOrDefault(); - return IsInLocalNetworkInternal(address.ToString(), false); + if (address != null) + { + Logger.Debug("{0} resolved to {1}", host, address); + + return IsInLocalNetworkInternal(address.ToString(), false); + } + } + catch (Exception ex) + { + Logger.ErrorException("Error resovling hostname {0}", ex, host); } - } - catch (Exception ex) - { - Logger.ErrorException("Error resovling hostname {0}", ex, host); } } -- cgit v1.2.3