Merge pull request #938 from NVentimiglia/dev

As an American, I had to correct the spelling of 'independent'
This commit is contained in:
Stephen Halter 2016-07-21 17:17:47 -07:00 committed by GitHub
commit 24fa5c0264
3 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{ {
/// <summary> /// <summary>
/// Block tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The /// Block tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The
/// individual blocks are then treated as independant array segments. /// individual blocks are then treated as independent array segments.
/// </summary> /// </summary>
public class MemoryPoolBlock public class MemoryPoolBlock
{ {

View File

@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{ {
/// <summary> /// <summary>
/// Slab tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The /// Slab tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The
/// individual blocks are then treated as independant array segments. /// individual blocks are then treated as independent array segments.
/// </summary> /// </summary>
public class MemoryPoolSlab : IDisposable public class MemoryPoolSlab : IDisposable
{ {

View File

@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
public static Task<int> GetCancelledZeroTask(CancellationToken cancellationToken = default(CancellationToken)) public static Task<int> GetCancelledZeroTask(CancellationToken cancellationToken = default(CancellationToken))
{ {
#if NETSTANDARD1_3 #if NETSTANDARD1_3
// Make sure cancellationToken is cancelled before passing to Task.FromCanceled // Make sure cancellationToken is canceled before passing to Task.FromCanceled
if (!cancellationToken.IsCancellationRequested) if (!cancellationToken.IsCancellationRequested)
{ {
cancellationToken = new CancellationToken(true); cancellationToken = new CancellationToken(true);