* Uri.cs: Do not escape querys or fragements. Only reduce certain

	schemes.

svn path=/trunk/mcs/; revision=22846

diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog
index 96d3f4b80eb51f7647812b27ea8dc17880e725e0..829f5a891223aab5436c5873d16b456fc5aadb06 100644 (file)
--- a/mcs/class/System/System/ChangeLog
+++ b/mcs/class/System/System/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-06  Jackson Harper  <jackson@ximian.com>
+
+       * Uri.cs: Do not escape querys or fragements. Only reduce certain
+       schemes.
+       
 2004-02-06  Jackson Harper  <jackson@ximian.com>
 
        * 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 26d6cc93d9aac5ebc8ad8ceffe4daa625535c62b..223a4ed3a2374097ac263c7de9b79918a495fea1 100755 (executable)
--- 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);
                }