2005-12-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* WebConfigurationSettings.cs: patch by Cyrille Colin that sets the right application path even when MapPath fails. Closes bug #77044. svn path=/trunk/mcs/; revision=54716
mono · Dec 22, 2005 · 0bb5724 · 0bb5724
1 parent ec63f04
commit 0bb5724
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* WebConfigurationSettings.cs: patch by Cyrille Colin that sets the
+	right application path even when MapPath fails. Closes bug #77044.
+
 2005-12-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* WebConfigurationSettings.cs: don't fail if <location> has more

diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -210,7 +210,12 @@ ConfigurationData GetConfigFromFileName (string filepath, HttpContext context)
 			if (data != null)
 				return data;
 
-			string realpath = context.Request.MapPath (dir);
+			string realpath = null;
+			try {
+				realpath = context.Request.MapPath (dir);
+			} catch {
+				realpath = context.Request.MapPath (HttpRuntime.AppDomainAppVirtualPath);
+			}
 			string lower = Path.Combine (realpath, "web.config");
 			bool isLower = File.Exists (lower);
 			string wcfile = null;