Rename CancellationToken parameter.

This commit is contained in:
Chris Ross 2014-06-26 10:11:29 -07:00
parent 55e491e354
commit df730a47a9
6 changed files with 8 additions and 8 deletions

View File

@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Http
/// Gets the form collection. /// Gets the form collection.
/// </summary> /// </summary>
/// <returns>The form collection parsed from the request body.</returns> /// <returns>The form collection parsed from the request body.</returns>
public abstract Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel = default(CancellationToken)); public abstract Task<IReadableStringCollection> GetFormAsync(CancellationToken cancellationToken = default(CancellationToken));
/// <summary> /// <summary>
/// Gets or set the owin.RequestProtocol. /// Gets or set the owin.RequestProtocol.

View File

@ -20,6 +20,6 @@ namespace Microsoft.AspNet.HttpFeature
/// Asynchronously retrieves the client certificate, if any. /// Asynchronously retrieves the client certificate, if any.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<X509Certificate> GetClientCertificateAsync(CancellationToken cancel); Task<X509Certificate> GetClientCertificateAsync(CancellationToken cancellationToken);
} }
} }

View File

@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Owin
set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); } set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); }
} }
Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancel) Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancellationToken)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

View File

@ -129,9 +129,9 @@ namespace Microsoft.AspNet.PipelineCore
get { return QueryFeature.Query; } get { return QueryFeature.Query; }
} }
public override Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel = default(CancellationToken)) public override Task<IReadableStringCollection> GetFormAsync(CancellationToken cancellationToken = default(CancellationToken))
{ {
return FormFeature.GetFormAsync(cancel); return FormFeature.GetFormAsync(cancellationToken);
} }
public override string Protocol public override string Protocol

View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNet.PipelineCore
_features = features; _features = features;
} }
public async Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel) public async Task<IReadableStringCollection> GetFormAsync(CancellationToken cancellationToken)
{ {
var body = _request.Fetch(_features).Body; var body = _request.Fetch(_features).Body;
@ -35,7 +35,7 @@ namespace Microsoft.AspNet.PipelineCore
if (!_bodyStream.CanSeek) if (!_bodyStream.CanSeek)
{ {
var buffer = new MemoryStream(); var buffer = new MemoryStream();
await _bodyStream.CopyToAsync(buffer, 4096, cancel); await _bodyStream.CopyToAsync(buffer, 4096, cancellationToken);
_bodyStream = buffer; _bodyStream = buffer;
_request.Fetch(_features).Body = _bodyStream; _request.Fetch(_features).Body = _bodyStream;
_bodyStream.Seek(0, SeekOrigin.Begin); _bodyStream.Seek(0, SeekOrigin.Begin);

View File

@ -9,6 +9,6 @@ namespace Microsoft.AspNet.PipelineCore
{ {
public interface IFormFeature public interface IFormFeature
{ {
Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel); Task<IReadableStringCollection> GetFormAsync(CancellationToken cancellationToken);
} }
} }