diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-07 02:39:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 02:39:42 -0400 |
| commit | 82d4566c6d40e0ffd32a5afd41d256788a0ae379 (patch) | |
| tree | 5c8c1f3c66acf073aaf1c6eb2984b3f6c7f9229a /MediaBrowser.Server.Implementations | |
| parent | 1640bcb28904bccb0c31a00377a9399925cf327d (diff) | |
| parent | e9bd472281aa2b3bba49f0b463469d22c89a0caa (diff) | |
Merge pull request #2032 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 7 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 4e913cf99..45cb2f57d 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -65,12 +65,11 @@ namespace MediaBrowser.Server.Implementations.Connect if (!string.IsNullOrWhiteSpace(address)) { - try - { - address = new Uri(address).Host; - } - catch + Uri newUri; + + if (Uri.TryCreate(address, UriKind.Absolute, out newUri)) { + address = newUri.Host; } } diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index dca753193..52723688f 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -73,8 +73,8 @@ <HintPath>..\packages\SimpleInjector.3.2.0\lib\net45\SimpleInjector.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="SocketHttpListener, Version=1.0.6062.28575, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\SocketHttpListener.1.0.0.38\lib\net45\SocketHttpListener.dll</HintPath> + <Reference Include="SocketHttpListener, Version=1.0.6063.4624, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\SocketHttpListener.1.0.0.39\lib\net45\SocketHttpListener.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 8f4795d53..bac5a7c5d 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -9,5 +9,5 @@ <package id="morelinq" version="1.4.0" targetFramework="net45" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
<package id="SimpleInjector" version="3.2.0" targetFramework="net45" />
- <package id="SocketHttpListener" version="1.0.0.38" targetFramework="net45" />
+ <package id="SocketHttpListener" version="1.0.0.39" targetFramework="net45" />
</packages>
\ No newline at end of file |