diff --git a/src/Microsoft.AspNet.Http/HttpRequest.cs b/src/Microsoft.AspNet.Http/HttpRequest.cs index f8632e5751..4d1aa1a9db 100644 --- a/src/Microsoft.AspNet.Http/HttpRequest.cs +++ b/src/Microsoft.AspNet.Http/HttpRequest.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Http /// Gets the form collection. /// /// The form collection parsed from the request body. - public abstract Task GetFormAsync(CancellationToken cancel = default(CancellationToken)); + public abstract Task GetFormAsync(CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets or set the owin.RequestProtocol. diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs b/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs index 2c9e77bdb1..b70fa027cf 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs @@ -20,6 +20,6 @@ namespace Microsoft.AspNet.HttpFeature /// Asynchronously retrieves the client certificate, if any. /// /// - Task GetClientCertificateAsync(CancellationToken cancel); + Task GetClientCertificateAsync(CancellationToken cancellationToken); } } diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index 8994dfa6f4..f0ebf96365 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs @@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Owin set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); } } - Task IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancel) + Task IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancellationToken) { throw new NotImplementedException(); } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs index 609bcf8b89..efdda560d1 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs @@ -129,9 +129,9 @@ namespace Microsoft.AspNet.PipelineCore get { return QueryFeature.Query; } } - public override Task GetFormAsync(CancellationToken cancel = default(CancellationToken)) + public override Task GetFormAsync(CancellationToken cancellationToken = default(CancellationToken)) { - return FormFeature.GetFormAsync(cancel); + return FormFeature.GetFormAsync(cancellationToken); } public override string Protocol diff --git a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs index 36b3a169c2..25472d4057 100644 --- a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNet.PipelineCore _features = features; } - public async Task GetFormAsync(CancellationToken cancel) + public async Task GetFormAsync(CancellationToken cancellationToken) { var body = _request.Fetch(_features).Body; @@ -35,7 +35,7 @@ namespace Microsoft.AspNet.PipelineCore if (!_bodyStream.CanSeek) { var buffer = new MemoryStream(); - await _bodyStream.CopyToAsync(buffer, 4096, cancel); + await _bodyStream.CopyToAsync(buffer, 4096, cancellationToken); _bodyStream = buffer; _request.Fetch(_features).Body = _bodyStream; _bodyStream.Seek(0, SeekOrigin.Begin); diff --git a/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs index 0aed1a00f3..07debf7870 100644 --- a/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs +++ b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs @@ -9,6 +9,6 @@ namespace Microsoft.AspNet.PipelineCore { public interface IFormFeature { - Task GetFormAsync(CancellationToken cancel); + Task GetFormAsync(CancellationToken cancellationToken); } }