diff options
| author | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-12-06 20:21:01 +0300 |
|---|---|---|
| committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-12-06 20:21:01 +0300 |
| commit | 9d4c25576ed36a2fc7e3ddd097a57107de1c8685 (patch) | |
| tree | 9ebff729d01491a8820b8bd406f101f461a3b5d9 | |
| parent | 3482a0b686b1717a6a7639bdde43123fda150a37 (diff) | |
Merge 69049 from trunk
* HttpRequest.cs: call MapPath on the HttpWorkerRequest so that if
FilePath is changed we get the new physical path, not the one of the
original request. Fixes bug #80152.
svn path=/branches/mono-1-2-2/mcs/; revision=69117
| -rw-r--r-- | mcs/class/System.Web/System.Web/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web/HttpRequest.cs | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog index f822a6122e9..7ec44b75fab 100644 --- a/mcs/class/System.Web/System.Web/ChangeLog +++ b/mcs/class/System.Web/System.Web/ChangeLog @@ -1,3 +1,9 @@ +2006-12-05 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * HttpRequest.cs: call MapPath on the HttpWorkerRequest so that if + FilePath is changed we get the new physical path, not the one of the + original request. Fixes bug #80152. + 2006-11-30 Gonzalo Paniagua Javier <gonzalo@ximian.com> * HttpRequest.cs: physical path comes from GetFilePathTranslated to diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs index c14bc7d4a56..f47bd56480a 100644 --- a/mcs/class/System.Web/System.Web/HttpRequest.cs +++ b/mcs/class/System.Web/System.Web/HttpRequest.cs @@ -925,7 +925,7 @@ namespace System.Web { if (physical_path == null) { // Don't call HttpRequest.MapPath here, as that one *trims* the input - physical_path = worker_request.GetFilePathTranslated (); + physical_path = worker_request.MapPath (FilePath); } if (SecurityManager.SecurityEnabled) { @@ -1248,6 +1248,7 @@ namespace System.Web { internal void SetFilePath (string path) { file_path = path; + physical_path = null; } internal void SetCurrentExePath (string path) |