Rename CancellationToken parameter.
This commit is contained in:
parent
55e491e354
commit
df730a47a9
|
|
@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Http
|
|||
/// Gets the form collection.
|
||||
/// </summary>
|
||||
/// <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>
|
||||
/// Gets or set the owin.RequestProtocol.
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ namespace Microsoft.AspNet.HttpFeature
|
|||
/// Asynchronously retrieves the client certificate, if any.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
Task<X509Certificate> GetClientCertificateAsync(CancellationToken cancel);
|
||||
Task<X509Certificate> GetClientCertificateAsync(CancellationToken cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Owin
|
|||
set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); }
|
||||
}
|
||||
|
||||
Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancel)
|
||||
Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,9 +129,9 @@ namespace Microsoft.AspNet.PipelineCore
|
|||
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
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace Microsoft.AspNet.PipelineCore
|
|||
_features = features;
|
||||
}
|
||||
|
||||
public async Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel)
|
||||
public async Task<IReadableStringCollection> 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);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@ namespace Microsoft.AspNet.PipelineCore
|
|||
{
|
||||
public interface IFormFeature
|
||||
{
|
||||
Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel);
|
||||
Task<IReadableStringCollection> GetFormAsync(CancellationToken cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue