Merge pull request #1222 from LogosBible/uri-trycreate

Lower-case the host in Uri.TryCreate to match behavior of constructors

diff --combined mcs/class/System/System/Uri.cs
index eab294b3f8f00fb84b3caf15d1acf4b4c1246a71,5a6b930d40201ba539cdf7809e3bb523b38786a1..a1417e99527c0bd59f0befff9246110310ab4080
--- 1/mcs/class/System/System/Uri.cs
--- 2/mcs/class/System/System/Uri.cs
+++ b/mcs/class/System/System/Uri.cs
@@@ -140,7 -140,9 +140,7 @@@ namespace System 
  
                static Uri ()
                {
 -#if NET_4_5
                        IriParsing = true;
 -#endif
  
                        var iriparsingVar = Environment.GetEnvironmentVariable ("MONO_URI_IRIPARSING");
                        if (iriparsingVar == "true")
@@@ -233,6 -235,11 +233,11 @@@
                                        success = false;
                                        break;
                                }
+ 
+                               if (success && host.Length > 1 && host [0] != '[' && host [host.Length - 1] != ']') {
+                                       // host name present (but not an IPv6 address)
+                                       host = host.ToLower (CultureInfo.InvariantCulture);
+                               }
                        }
                }
  
@@@ -335,6 -342,12 +340,6 @@@
                                }
                        } else {
                                path = baseEl.path;
 -#if !NET_4_0
 -                              if (relativeEl.query != null) {
 -                                      var pathEnd = path.LastIndexOf ('/');
 -                                      path = (pathEnd > 0)? path.Substring (0, pathEnd+1) : "";
 -                              }
 -#endif
                        }
  
                        if ((path.Length == 0 || path [0] != '/') && baseEl.delimiter == SchemeDelimiter)
@@@ -942,8 -955,10 +947,8 @@@
                //
                public Uri MakeRelativeUri (Uri uri)
                {
 -#if NET_4_0
                        if (uri == null)
                                throw new ArgumentNullException ("uri");
 -#endif
                        if (Host != uri.Host || Scheme != uri.Scheme)
                                return uri;
  
@@@ -1132,9 -1147,6 +1137,6 @@@
                {
                        Parse (kind, source);
  
-                       if (userEscaped)
-                               return;
- 
                        if (host.Length > 1 && host [0] != '[' && host [host.Length - 1] != ']') {
                                // host name present (but not an IPv6 address)
                                host = host.ToLower (CultureInfo.InvariantCulture);
@@@ -1715,7 -1727,7 +1717,7 @@@
                private UriParser Parser {
                        get {
                                if (parser == null) {
 -                                      parser = UriParser.GetParser (Scheme);
 +                                      parser = UriParser.GetParser (scheme);
                                        // no specific parser ? then use a default one
                                        if (parser == null)
                                                parser = new DefaultUriParser ("*");
@@@ -1727,16 -1739,15 +1729,16 @@@
  
                public string GetComponents (UriComponents components, UriFormat format)
                {
 +                      if ((components & UriComponents.SerializationInfoString) == 0)
 +                              EnsureAbsoluteUri ();
 +
                        return Parser.GetComponents (this, components, format);
                }
  
                public bool IsBaseOf (Uri uri)
                {
 -#if NET_4_0
                        if (uri == null)
                                throw new ArgumentNullException ("uri");
 -#endif
                        return Parser.IsBaseOf (this, uri);
                }
  
@@@ -1760,10 -1771,6 +1762,10 @@@
  
                        if ((uri1 == null) && (uri2 == null))
                                return 0;
 +                      if (uri1 == null)
 +                              return -1;
 +                      if (uri2 == null)
 +                              return 1;
  
                        string s1 = uri1.GetComponents (partsToCompare, compareFormat);
                        string s2 = uri2.GetComponents (partsToCompare, compareFormat);
@@@ -1788,6 -1795,18 +1790,6 @@@
                                return false;
                        }
  
 -#if !NET_4_5
 -                      switch (b) {
 -                      case '!':
 -                      case '\'':
 -                      case '(':
 -                      case ')':
 -                      case '*':
 -                      case '-':
 -                      case '.':
 -                              return false;
 -                      }
 -#endif
  
                        return true;
                }
@@@ -1841,9 -1860,11 +1843,9 @@@
                        case '_':
                        case '~':
                                return false;
 -#if NET_4_5
                        case '[':
                        case ']':
                                return false;
 -#endif
                        }
  
                        return true;
@@@ -1931,8 -1952,10 +1933,8 @@@
                        result = null;
                        if ((baseUri == null) || !baseUri.IsAbsoluteUri)
                                return false;
 -#if NET_4_0
                        if (relativeUri == null)
                                return false;
 -#endif
                        try {
                                // FIXME: this should call UriParser.Resolve
                                result = new Uri (baseUri, relativeUri.OriginalString);

diff --combined mcs/class/System/Test/System/UriTest3.cs
index 0300aad9d579b981a08d5b90585e0249b3a3f296,db22913e3a760586a824230d855eed384a2d9dbf..7ff8924d0daaed4c9091dbdcbba456fa6b3a0323
--- 1/mcs/class/System/Test/System/UriTest3.cs
--- 2/mcs/class/System/Test/System/UriTest3.cs
+++ b/mcs/class/System/Test/System/UriTest3.cs
@@@ -184,6 -184,12 +184,12 @@@ namespace MonoTests.Syste
  
                        Assert.IsTrue (Uri.TryCreate ("http://mono-project.com/☕", UriKind.Absolute, out uri), "highunicode-Absolute");
                        Assert.AreEqual("http://mono-project.com/%E2%98%95", uri.AbsoluteUri, "highunicode-Absolute-AbsoluteUri");
+ 
+                       string mixedCaseUri = "http://mOnO-proJECT.com";
+                       uri = new Uri (mixedCaseUri);
+                       Uri uri2;
+                       Assert.IsTrue (Uri.TryCreate (mixedCaseUri, UriKind.Absolute, out uri2), "mixedcasehost-absolute");
+                       Assert.AreEqual (uri.AbsoluteUri, uri2.AbsoluteUri, "mixedcasehost-absoluteuri-absoluteuri");
                }
  
                [Test] // TryCreate (String, UriKind, Uri)
@@@ -340,13 -346,6 +346,13 @@@
                        Uri u2 = null;
                        Assert.AreEqual (0, Uri.Compare (u1, u2, UriComponents.AbsoluteUri, UriFormat.UriEscaped, StringComparison.CurrentCulture), "null-null");
  
 +                      u1 = new Uri ("http://www.go-mono.com");
 +                      Assert.AreEqual (1, Uri.Compare (u1, u2, UriComponents.AbsoluteUri, UriFormat.UriEscaped, StringComparison.CurrentCulture), "non-null - null");
 +
 +                      u1 = null;
 +                      u2 = new Uri ("http://www.go-mono.com");
 +                      Assert.AreEqual (-1, Uri.Compare (u1, u2, UriComponents.AbsoluteUri, UriFormat.UriEscaped, StringComparison.CurrentCulture), "null - non-null");
 +
                        u1 = new Uri ("http://www.go-mono.com/Main Page");
                        u2 = new Uri ("http://www.go-mono.com/Main%20Page");
                        Assert.AreEqual (0, Uri.Compare (u1, u2, UriComponents.AbsoluteUri, UriFormat.Unescaped, StringComparison.CurrentCulture), "http/space-http/%20-unescaped");
@@@ -425,8 -424,13 +431,8 @@@
                                http.IsBaseOf (null);
                                Assert.Fail ();
                        }
 -#if NET_4_0
                        catch (ArgumentNullException) {
                        }
 -#else
 -                      catch (NullReferenceException) {
 -                      }
 -#endif
                }
  
                [Test]