diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2008-04-15 19:55:12 +0400 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2008-04-15 19:55:12 +0400 |
| commit | e5b536080968374f57c0d2df2cce648c80d438ea (patch) | |
| tree | 6dd1184ac5afb6ed77c3ad2fac1a835daa15e3bb | |
| parent | ee25cfd6d7dce03fc151e506be88cac0555d89a4 (diff) | |
Backport of r100737
svn path=/branches/mono-1-9/mcs/; revision=100738
4 files changed, 13 insertions, 3 deletions
diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs index e4294131139..205e33fd192 100644 --- a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs +++ b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs @@ -191,7 +191,7 @@ namespace System.Web.Hosting { } } - 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 index ac021ddb428..d24f994c1cb 100644 --- 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 index 30069da9418..3599fe758f9 100644 --- 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 @@ namespace MonoTests.System.Web.Hosting { 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 index b8b85aef2e1..a8e8305bab9 100644 --- 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 |