2003-02-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* AspGenerator.cs: remove "file://" from the private bin path. Fixes
	bug #37628.

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index 86a42339e5f124581982cbb6808646ae885667d7..f977cf5475feded70b9db763e24aa8d4c3997be4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -344,8 +344,12 @@ class AspGenerator
                if (privateBinPath == null || privateBinPath.Length == 0)
                        privateBinPath = "bin";
                        
-               if (!Path.IsPathRooted (privateBinPath))
-                       privateBinPath = Path.Combine (setup.ApplicationBase, privateBinPath);
+               if (!Path.IsPathRooted (privateBinPath)) {
+                       string appbase = setup.ApplicationBase;
+                       if (appbase.StartsWith ("file://"))
+                               appbase = appbase.Substring (7);
+                       privateBinPath = Path.Combine (appbase, privateBinPath);
+               }
                
                Init ();
        }

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index d8d6ce44a83ed247d3a9df932048b5a0e56f46d8..2abe76e9fb13bac5c844132d3c83714686da5914 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * AspGenerator.cs: remove "file://" from the private bin path. Fixes
+       bug #37628.
+
 2003-02-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * AspParser.cs: the parser fires events when it parses an element.