Backport of r100737

svn path=/branches/mono-1-9/mcs/; revision=100738
mono · Apr 15, 2008 · e5b5360 · e5b5360
1 parent ee25cfd
commit e5b5360
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
@@ -191,7 +191,7 @@ public static object CreateApplicationHost (Type hostType, string virtualDir, st
 				}
 			}
 
-			setup.PrivateBinPath = BuildPrivateBinPath (physicalDir, bindirPath);
+			setup.PrivateBinPath = BuildPrivateBinPath (physicalDir, HttpApplication.BinDirs);
 			setup.PrivateBinPathProbe = "*";
 			setup.ShadowCopyFiles = "true";
 			setup.ShadowCopyDirectories = setup.PrivateBinPath;

diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+	* ApplicationHost.cs: restore Bin;bin to PrivateBinPath, as a
+	work-around for an IOMAP bug. Fixes bugs #379890 and #379888
+
 2008-03-13  Marek Habersack  <mhabersack@novell.com>
 
 	* ApplicationHost.cs: use HttpRuntime.CaseInsensitive when

diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs b/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
@@ -171,9 +171,9 @@ public void ConstructorTest ()
 			p ("LoaderOptimization is: ", setup.LoaderOptimization);
 			Assert.AreEqual (
 #if NET_2_0
-				String.Format ("{0}{1}bin", tb, Path.DirectorySeparatorChar),
+				String.Format ("{0}{1}Bin;{0}{1}bin", tb, Path.DirectorySeparatorChar),
 #else
-				"bin",
+				"Bin;bin",
 #endif
 				setup.PrivateBinPath, "D9"
 			);

diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+	* ApplicationHostTest.cs: test update for the PrivateBinPath
+	change in ApplicationHost (a work-around for an IOMAP bug).
+
 2008-03-13  Marek Habersack  <mhabersack@novell.com>
 
 	* ApplicationHostTest.cs: adjust test for the PrivateBinPath