فهرست منبع

2004-02-24 Gonzalo Paniagua Javier <[email protected]>

	* WebConfigurationSettings.cs: we were loading web.config from / always!
	Thanks to Lluis for noticing this.

svn path=/trunk/mcs/; revision=23420
Gonzalo Paniagua Javier 22 سال پیش
والد
کامیت
845610468b

+ 6 - 1
mcs/class/System.Web/System.Web.Configuration/ChangeLog

@@ -1,6 +1,11 @@
+2004-02-24  Gonzalo Paniagua Javier <[email protected]>
+
+	* WebConfigurationSettings.cs: we were loading web.config from / always!
+	Thanks to Lluis for noticing this.
+
 2004-02-09  Gonzalo Paniagua Javier <[email protected]>
 
-	* WebConfigurationSettings.cs: fix Web.config search for caseo
+	* WebConfigurationSettings.cs: fix Web.config search for case
 	insensitive filesystems.
 
 2004-02-04  Lluis Sanchez Gual <[email protected]>

+ 3 - 3
mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs

@@ -140,6 +140,9 @@ namespace System.Web.Configuration
 			}
 
 			string dir = UrlUtils.GetDirectory (filepath);
+			if (dir == "/")
+				dir = "";
+
 			if (fileToConfig.ContainsKey (dir)) {
 				ConfigurationData data = (ConfigurationData) fileToConfig [dir];
 				if (CheckFileCache (data))
@@ -154,9 +157,6 @@ namespace System.Web.Configuration
 			if (isUpper && isLower && Directory.GetFiles (realpath, "Web.config").Length < 2)
 				throw new ConfigurationException ("Both web.config and Web.config exist for " + dir);
 
-			if (dir == "/")
-				dir = "";
-
 			string wcfile = (isUpper) ? upper : (isLower) ? lower : null;
 			ConfigurationData parent = GetConfigFromFileName (dir, context);
 			if (wcfile == null || parent.FileName == wcfile) {