Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs

@@ -39,12 +39,11 @@ using System.Security.Permissions;
 using System.Security.Principal;
 using System.Text;
 using System.Web.Caching;
+using System.Threading;
 
 namespace System.Web
 {
-#if NET_4_0
         [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public class HttpResponseWrapper : HttpResponseBase
@@ -82,6 +81,10 @@ namespace System.Web
 			set { w.Charset = value; }
 		}
 
+		public override CancellationToken ClientDisconnectedToken {
+			get { return CancellationToken.None; }
+		}
+
 		public override Encoding ContentEncoding {
 			get { return w.ContentEncoding; }
 			set { w.ContentEncoding = value; }
@@ -130,9 +133,7 @@ namespace System.Web
 
 		public override TextWriter Output {
 			get { return w.Output; }
-#if NET_4_0
 			set { w.Output = value; }
-#endif
 		}
 
 		public override Stream OutputStream {
@@ -169,12 +170,10 @@ namespace System.Web
 			set { w.SuppressContent = value; }
 		}
 
-#if NET_4_5
 		public override bool SuppressFormsAuthenticationRedirect {
 			get { return w.SuppressFormsAuthenticationRedirect; }
 			set { w.SuppressFormsAuthenticationRedirect = value; }
 		}
-#endif
 
 		public override bool TrySkipIisCustomErrors {
 			get { return w.TrySkipIisCustomErrors; }
@@ -295,7 +294,6 @@ namespace System.Web
 		{
 			w.Redirect (url, endResponse);
 		}
-#if NET_4_0
 		public override void RedirectPermanent (string url)
 		{
 			w.RedirectPermanent (url);
@@ -310,7 +308,6 @@ namespace System.Web
 		{
 			HttpResponse.RemoveOutputCacheItem (path, providerName);
 		}
-#endif
 		public override void RemoveOutputCacheItem (string path)
 		{
 			 HttpResponse.RemoveOutputCacheItem (path);