2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Web / System.Web / HttpResponse.cs

diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs
index 522bcd32c1b9013af94890d9c56c8a6e7a562d93..734c2018db7a4cf2a6ec79ff1dfa8c58a900aabf 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpResponse.cs
+++ b/mcs/class/System.Web/System.Web/HttpResponse.cs
@@ -356,8 +356,15 @@ namespace System.Web
                                virtualPath = UrlUtils.Reduce (virtualPath);
                        }
 
-                       if (app_path_mod != null && virtualPath.IndexOf (app_path_mod) > 0)
-                               virtualPath = UrlUtils.Combine (app_path_mod, virtualPath);
+                       if (app_path_mod != null && virtualPath.IndexOf (app_path_mod) < 0) {
+                               string rvd = _Context.Request.RootVirtualDir;
+                               string basevd = rvd.Replace (app_path_mod, "");
+
+                               if (!virtualPath.StartsWith (basevd))
+                                       return virtualPath;
+
+                               virtualPath = UrlUtils.Combine (rvd, virtualPath.Substring (basevd.Length));
+                       }
 
                        return virtualPath;
                }