Author: kostat
Date: 2006-09-10 10:09:34 -0400 (Sun, 10 Sep 2006)
New Revision: 65171
Modified:
trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
trunk/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
Log:
merge -r 65169:65170
Modified: trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
2006-09-10 14:05:11 UTC (rev 65170)
+++ trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
2006-09-10 14:09:34 UTC (rev 65171)
@@ -23,7 +23,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#define USE_APPSERVER_THREAD
+//#define USE_APPSERVER_THREAD
using System;
Modified: trunk/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs 2006-09-10
14:05:11 UTC (rev 65170)
+++ trunk/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs 2006-09-10
14:09:34 UTC (rev 65171)
@@ -134,7 +134,11 @@
public static Type GetObjectType(string url)
{
+#if NET_2_0
+ return
GetCachedType(System.Web.Util.UrlUtils.RemoveDoubleSlashes(url));
+#else
return GetCachedType(url);
+#endif
}
private static Type GetCachedType(string url)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches