diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2008-04-10 00:46:11 +0400 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2008-04-10 00:46:11 +0400 |
| commit | 381a19993a375d72575165f0365d0d07887fc61a (patch) | |
| tree | e6406c8753db3e85d22990e4ad4def29bbfa11af | |
| parent | 153523afb39cd1fe52174ed307807f0bc4ec0147 (diff) | |
Backport of r100273
svn path=/branches/mono-1-9/mcs/; revision=100274
| -rw-r--r-- | mcs/class/System.Web/System.Web/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web/HttpContext.cs | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog index ee5e1181c6b..e9b81d6905a 100644 --- a/mcs/class/System.Web/System.Web/ChangeLog +++ b/mcs/class/System.Web/System.Web/ChangeLog @@ -1,3 +1,8 @@ +2008-04-09 Marek Habersack <mhabersack@novell.com> + + * HttpContext.cs: make RewritePath work correctly in the 2.0 + profile, fixes bug #371581 + 2008-03-13 Marek Habersack <mhabersack@novell.com> * HttpApplicationFactory.cs: use HttpApplication.BinDirs to diff --git a/mcs/class/System.Web/System.Web/HttpContext.cs b/mcs/class/System.Web/System.Web/HttpContext.cs index ecdd3e2100a..05234bfdc0a 100644 --- a/mcs/class/System.Web/System.Web/HttpContext.cs +++ b/mcs/class/System.Web/System.Web/HttpContext.cs @@ -583,7 +583,11 @@ namespace System.Web { public void RewritePath (string filePath, string pathInfo, string queryString) { +#if NET_2_0 + RewritePath (filePath, pathInfo, queryString, true); +#else RewritePath (filePath, pathInfo, queryString, false); +#endif } #if NET_2_0 @@ -612,6 +616,10 @@ namespace System.Web { throw new HttpException (404, "The virtual path '" + filePath + "' maps to another application.", filePath); Request.SetCurrentExePath (filePath); +#if NET_2_0 + Request.SetFilePath (filePath); +#endif + // A null pathInfo or queryString is ignored and previous values remain untouched if (pathInfo != null) Request.SetPathInfo (pathInfo); |