Merge pull request #1371 from martinjt/AddClientDisconnectedToken

Add ClientDisconnectedToken property to HttpResponseBase and Wrapper as ...

2 files changed, 12 insertions, 0 deletions

diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
index 921ace9ea84..2bf8ebd2f21 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
@@ -39,6 +39,7 @@ using System.Security.Permissions;
 using System.Security.Principal;
 using System.Text;
 using System.Web.Caching;
+using System.Threading;
 
 #if NET_4_0
 using System.Web.Routing;
@@ -69,6 +70,10 @@ namespace System.Web
 
 		public virtual string Charset { get { NotImplemented (); return null; } set { NotImplemented (); } }
 
+#if NET_4_5
+		public virtual CancellationToken ClientDisconnectedToken { get { NotImplemented (); return CancellationToken.None; } }
+#endif
+
 		public virtual Encoding ContentEncoding { get { NotImplemented (); return null; } set { NotImplemented (); } }
 
 		public virtual string ContentType { get { NotImplemented (); return null; } set { NotImplemented (); } }
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
index 1d9c2078171..adb5f74edd7 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
@@ -39,6 +39,7 @@ using System.Security.Permissions;
 using System.Security.Principal;
 using System.Text;
 using System.Web.Caching;
+using System.Threading;
 
 namespace System.Web
 {
@@ -82,6 +83,12 @@ namespace System.Web
 			set { w.Charset = value; }
 		}
 
+#if NET_4_5
+		public override CancellationToken ClientDisconnectedToken {
+			get { return CancellationToken.None; }
+		}
+#endif
+
 		public override Encoding ContentEncoding {
 			get { return w.ContentEncoding; }
 			set { w.ContentEncoding = value; }