2008-04-29 Marek Habersack <[email protected]>

	* WebConfigurationSettings.cs: if path mapping fails in
	GetConfigFromFileName, fall back to the application's physical
	directory.

2008-04-29  Marek Habersack  <[email protected]>

	* HttpException.cs: safe guard against context being null in
	GetHtmlErrorMessage.

2008-04-29  Marek Habersack  <[email protected]>

	* WebServiceCompiler.cs: if compiling a body-less web service, try
	to load the class type from the loaded assemblies before
	attempting to find it in the assemblies on disk.

svn path=/trunk/mcs/; revision=102127

mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,9 @@
+2008-04-29  Marek Habersack  <[email protected]>
+
+	* WebServiceCompiler.cs: if compiling a body-less web service, try
+	to load the class type from the loaded assemblies before
+	attempting to find it in the assemblies on disk.
+
 2008-04-28  Marek Habersack  <[email protected]>
 
 	* BuildManager.cs: ignore bad assemblies in the bin/

mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs

@@ -61,7 +61,9 @@ namespace System.Web.Compilation
 				return type;
 
 			if (parser.Program.Trim () == "") {
-				type = parser.GetTypeFromBin (parser.ClassName);
+				type = Type.GetType (parser.ClassName, false);
+				if (type == null)
+					type = parser.GetTypeFromBin (parser.ClassName);
 				CachingCompiler.InsertTypeFileDep (type, parser.PhysicalPath);
 				return type;
 			}

mcs/class/System.Web/System.Web.Configuration/ChangeLog

@@ -1,3 +1,9 @@
+2008-04-29  Marek Habersack  <[email protected]>
+
+	* WebConfigurationSettings.cs: if path mapping fails in
+	GetConfigFromFileName, fall back to the application's physical
+	directory.
+
 2008-03-23  Dean Brettle <[email protected]>
 
 	* HttpCapabilitiesBase.cs (GetConfigCapabilities): changed to use

mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs

@@ -217,6 +217,10 @@ namespace System.Web.Configuration
 			} catch {
 				realpath = context.Request.MapPath (HttpRuntime.AppDomainAppVirtualPath);
 			}
+			
+			if (realpath == null || realpath.Length == 0)
+				realpath = HttpRuntime.AppDomainAppPath;
+			
 			string lower = Path.Combine (realpath, "web.config");
 			bool isLower = File.Exists (lower);
 			string wcfile = null;

mcs/class/System.Web/System.Web/ChangeLog

@@ -1,3 +1,8 @@
+2008-04-29  Marek Habersack  <[email protected]>
+
+	* HttpException.cs: safe guard against context being null in
+	GetHtmlErrorMessage.
+
 2008-04-26  Marek Habersack  <[email protected]>
 
 	* VirtualPath.cs: added a new property, PhysicalPath.

mcs/class/System.Web/System.Web/HttpException.cs

@@ -127,7 +127,8 @@ namespace System.Web
 		public string GetHtmlErrorMessage ()
 		{
 			try {
-				if (HttpContext.Current.IsCustomErrorEnabled)
+				HttpContext ctx = HttpContext.Current;
+				if (ctx != null && ctx.IsCustomErrorEnabled)
 					return GetCustomErrorDefaultMessage ();
 				
 				if (!(this.InnerException is HtmlizedException))