remove duplicated code

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index bc55d175d444e625764833e552882e88268a116a..1c979f6f6eb61a5e305e6397cc42446bc8e68184 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-11 Andrew Skiba <andrews@mainsoft.com>
+
+       * HttpRequest.cs: remove code duplication (see UrlUtils.Combine)
+
 2006-04-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HttpUtility.cs: allow "%%" as a escape for '%' and ignore invalid

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index 68898febc4bf0fae1035ab8893a7b5a5eaff8e18..25b85e6d1307d63b8975d94b1dc2fe6c951537ed 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -1163,16 +1163,9 @@ namespace System.Web {
                        if (virtualPath.StartsWith(vmw.common.IAppDomainConfig.WAR_ROOT_SYMBOL))                        
                                return  virtualPath;                    
 #endif 
-                       if (System.IO.Path.DirectorySeparatorChar != '/')
-                               virtualPath = virtualPath.Replace (System.IO.Path.DirectorySeparatorChar, '/');
-
-                       if (UrlUtils.IsRooted (virtualPath))
-                               virtualPath = UrlUtils.Canonic (virtualPath);
-                       else {
-                               if (baseVirtualDir == null)
-                                       baseVirtualDir = RootVirtualDir;
-                               virtualPath = UrlUtils.Combine (baseVirtualDir, virtualPath);
-                       }
+                       if (baseVirtualDir == null)
+                               baseVirtualDir = RootVirtualDir;
+                       virtualPath = UrlUtils.Combine (baseVirtualDir, virtualPath);
 
                        if (!allowCrossAppMapping){
                                if (!StrUtils.StartsWith (virtualPath, RootVirtualDir, true))