Author: gonzalo
Date: 2006-11-04 12:06:31 -0500 (Sat, 04 Nov 2006)
New Revision: 67357
Modified:
trunk/mcs/class/System.Web/System.Web/ChangeLog
trunk/mcs/class/System.Web/System.Web/HttpApplication.cs
Log:
2006-11-04 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* HttpApplication.cs: the unexpected 'tick' exceptions can be an abort
exception due to timeout or end of the request.
Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog 2006-11-04 16:41:59 UTC
(rev 67356)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog 2006-11-04 17:06:31 UTC
(rev 67357)
@@ -1,3 +1,8 @@
+2006-11-04 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * HttpApplication.cs: the unexpected 'tick' exceptions can be an abort
+ exception due to timeout or end of the request.
+
2006-10-18 Marek Habersack <[EMAIL PROTECTED]>
* HttpRuntime.cs: add support for compilation of local resources
Modified: trunk/mcs/class/System.Web/System.Web/HttpApplication.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpApplication.cs 2006-11-04
16:41:59 UTC (rev 67356)
+++ trunk/mcs/class/System.Web/System.Web/HttpApplication.cs 2006-11-04
17:06:31 UTC (rev 67357)
@@ -626,6 +626,14 @@
if (pipeline == null ||
(bool)pipeline.Current)
PipelineDone ();
}
+ } catch (ThreadAbortException) {
+ object obj = taex.ExceptionState;
+ Thread.ResetAbort ();
+ stop_processing = true;
+ if (obj is StepTimeout)
+ ProcessError (new HttpException ("The
request timed out."));
+ else
+ PipelineDone ();
} catch (Exception e) {
Console.WriteLine ("Tick caught an exception
that has not been propagated:\n" + e);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
