Author: spouliot
Date: 2005-09-02 19:27:20 -0400 (Fri, 02 Sep 2005)
New Revision: 49382
Modified:
trunk/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
trunk/mcs/class/System.Web/System.Web.Handlers/ChangeLog
trunk/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
Log:
2005-09-02 Sebastien Pouliot <[EMAIL PROTECTED]>
* AssemblyResourceLoader.cs: Class is sealed in 2.0.
* TraceHandler.cs: Added security permissions on class (LinkDemand and
InheritanceDemand for AspNetHostingPermission) and on ctor (Demand for
UnmanagedCode). Stubbed new protected methods for 2.0.
Modified:
trunk/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
2005-09-02 22:55:48 UTC (rev 49381)
+++ trunk/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
2005-09-02 23:27:20 UTC (rev 49382)
@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Web;
using System.Web.UI;
using System.Reflection;
using System.IO;
@@ -36,7 +35,7 @@
namespace System.Web.Handlers {
[MonoTODO ("Should we cache stuff?")]
#if NET_2_0
- public
+ public sealed
#else
internal // since this is in the .config file, we need to support it,
since we dont have versoned support.
#endif
Modified: trunk/mcs/class/System.Web/System.Web.Handlers/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Handlers/ChangeLog 2005-09-02
22:55:48 UTC (rev 49381)
+++ trunk/mcs/class/System.Web/System.Web.Handlers/ChangeLog 2005-09-02
23:27:20 UTC (rev 49382)
@@ -1,3 +1,10 @@
+2005-09-02 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * AssemblyResourceLoader.cs: Class is sealed in 2.0.
+ * TraceHandler.cs: Added security permissions on class (LinkDemand and
+ InheritanceDemand for AspNetHostingPermission) and on ctor (Demand for
+ UnmanagedCode). Stubbed new protected methods for 2.0.
+
2004-11-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* AssemblyResourceLoader.cs: Use a special name when encoding a resource
Modified: trunk/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
2005-09-02 22:55:48 UTC (rev 49381)
+++ trunk/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
2005-09-02 23:27:20 UTC (rev 49382)
@@ -32,7 +32,7 @@
using System.Collections;
using System.Data;
-using System.Web;
+using System.Security.Permissions;
using System.Web.Util;
using System.Web.UI;
using System.Web.UI.WebControls;
@@ -62,9 +62,23 @@
}
}
+ // CAS
+ [AspNetHostingPermission (SecurityAction.LinkDemand, Level =
AspNetHostingPermissionLevel.Minimal)]
+ [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level =
AspNetHostingPermissionLevel.Minimal)]
public class TraceHandler : IHttpHandler
{
+ [SecurityPermission (SecurityAction.Demand, UnmanagedCode =
true)]
+ public TraceHandler ()
+ {
+ // LAMESPEC: the ctor is documented to have a Demand
for a SecurityPermission
+ // but doesn't specify which one it is (tests shows
it's UnmanagedCode)
+ }
+
+#if NET_2_0
+ public void ProcessRequest (HttpContext context)
+#else
void IHttpHandler.ProcessRequest (HttpContext context)
+#endif
{
TraceManager manager = HttpRuntime.TraceManager;
@@ -90,8 +104,11 @@
}
- bool IHttpHandler.IsReusable
- {
+#if NET_2_0
+ public bool IsReusable {
+#else
+ bool IHttpHandler.IsReusable {
+#endif
get {
return false;
}
@@ -176,11 +193,21 @@
protected void ShowDetails (DataSet data)
{
}
+#if NET_2_0
+ [MonoTODO ("Appears in class status, but...")]
+ protected void ShowRequests (IList data)
+ {
+ }
+ [MonoTODO]
+ protected void ShowVersionDetails ()
+ {
+ }
+#else
[MonoTODO ("Appears in class status, but...")]
protected void ShowRequests (ArrayList list)
{
}
+#endif
}
}
-
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
