From 1b6d6c26d5b8b0585a2fea4d79db02b77294bf4b Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Fri, 28 Jul 2017 20:01:29 +0200
Subject: [PATCH] Fixed HttpUri parsing of domain names with underscores.

---
 src/NzbDrone.Common.Test/Http/HttpUriFixture.cs | 9 ++++++++-
 src/NzbDrone.Common/Http/HttpUri.cs             | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs b/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
index 099ab990f..dea6f64cd 100644
--- a/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
@@ -7,6 +7,13 @@ namespace NzbDrone.Common.Test.Http
 {
     public class HttpUriFixture : TestBase
     {
+        [TestCase("abc://my_host.com:8080/root/api/")]
+        public void should_parse(string uri)
+        {
+            var newUri = new HttpUri(uri);
+            newUri.FullUri.Should().Be(uri);
+        }
+
         [TestCase("", "", "")]
         [TestCase("/", "", "/")]
         [TestCase("base", "", "base")]
@@ -77,7 +84,7 @@ namespace NzbDrone.Common.Test.Http
         public void should_combine_relative_path(string basePath, string relativePath, string expected)
         {
             var newUri = new HttpUri(basePath).CombinePath(relativePath);
-            
+
             newUri.FullUri.Should().Be(expected);
         }
     }
diff --git a/src/NzbDrone.Common/Http/HttpUri.cs b/src/NzbDrone.Common/Http/HttpUri.cs
index 23e47be94..cbbecd718 100644
--- a/src/NzbDrone.Common/Http/HttpUri.cs
+++ b/src/NzbDrone.Common/Http/HttpUri.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Http
 {
     public class HttpUri : IEquatable<HttpUri>
     {
-        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly string _uri;
         public string FullUri => _uri;
@@ -168,7 +168,7 @@ namespace NzbDrone.Common.Http
             {
                 return basePath.Substring(0, baseSlashIndex) + "/" + relativePath;
             }
-            
+
             return relativePath;
         }
 
@@ -263,7 +263,7 @@ namespace NzbDrone.Common.Http
             {
                 return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, CombineRelativePath(baseUrl.Path, relativeUrl.Path), relativeUrl.Query, relativeUrl.Fragment);
             }
-            
+
             return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, baseUrl.Path, relativeUrl.Query, relativeUrl.Fragment);
         }
     }