From 3a71b63f4a0e69c2ffb40cbe3a8f100d54d31715 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 6 Feb 2004 21:28:28 +0000 Subject: [PATCH] * Uri.cs: Do not escape querys or fragements. Only reduce certain schemes. svn path=/trunk/mcs/; revision=22846 --- mcs/class/System/System/ChangeLog | 5 +++++ mcs/class/System/System/Uri.cs | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog index 96d3f4b80eb..829f5a89122 100644 --- a/mcs/class/System/System/ChangeLog +++ b/mcs/class/System/System/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Jackson Harper + + * Uri.cs: Do not escape querys or fragements. Only reduce certain + schemes. + 2004-02-06 Jackson Harper * Uri.cs: Use UTF8 characters when escaping. Reduce paths. This diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs index 26d6cc93d9a..223a4ed3a23 100755 --- a/mcs/class/System/System/Uri.cs +++ b/mcs/class/System/System/Uri.cs @@ -96,8 +96,6 @@ namespace System host = EscapeString (host, false, true, false); path = EscapeString (path); - query = EscapeString (query); - fragment = EscapeString (fragment, false, false, true); } public Uri (Uri baseUri, string relativeUri) @@ -147,8 +145,6 @@ namespace System host = EscapeString (host, false, true, false); path = EscapeString (path); - query = EscapeString (query); - fragment = EscapeString (fragment, false, false, true); return; } } @@ -157,8 +153,6 @@ namespace System pos = relativeUri.IndexOf ('#'); if (pos != -1) { fragment = relativeUri.Substring (pos); - if (!userEscaped) - fragment = EscapeString (fragment, false, false, true); relativeUri = relativeUri.Substring (0, pos); } @@ -928,6 +922,9 @@ namespace System isUnc = true; } + if ((scheme != Uri.UriSchemeMailto) && + (scheme != Uri.UriSchemeNews) && + (scheme != Uri.UriSchemeFile)) path = Reduce (path); } -- 2.25.1