From 55e491e354321f83b7582c5898b01add117fa501 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Wed, 25 Jun 2014 09:15:11 -0700
Subject: [PATCH] Make CancellationToken a default param.

---
 src/Microsoft.AspNet.Http/HttpRequest.cs              | 11 +----------
 .../DefaultHttpRequest.cs                             |  2 +-
 src/Microsoft.AspNet.PipelineCore/FormFeature.cs      |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.AspNet.Http/HttpRequest.cs b/src/Microsoft.AspNet.Http/HttpRequest.cs
index 44fa1e945b..f8632e5751 100644
--- a/src/Microsoft.AspNet.Http/HttpRequest.cs
+++ b/src/Microsoft.AspNet.Http/HttpRequest.cs
@@ -66,16 +66,7 @@ namespace Microsoft.AspNet.Http
         /// Gets the form collection.
         /// </summary>
         /// <returns>The form collection parsed from the request body.</returns>
-        public virtual Task<IReadableStringCollection> GetFormAsync()
-        {
-            return GetFormAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Gets the form collection.
-        /// </summary>
-        /// <returns>The form collection parsed from the request body.</returns>
-        public abstract Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel);
+        public abstract Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel = default(CancellationToken));
 
         /// <summary>
         /// Gets or set the owin.RequestProtocol.
diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
index eba4253862..609bcf8b89 100644
--- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
+++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs
@@ -129,7 +129,7 @@ namespace Microsoft.AspNet.PipelineCore
             get { return QueryFeature.Query; }
         }
 
-        public override Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel)
+        public override Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel = default(CancellationToken))
         {
             return FormFeature.GetFormAsync(cancel);
         }
diff --git a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs
index 86e1d4c0f3..36b3a169c2 100644
--- a/src/Microsoft.AspNet.PipelineCore/FormFeature.cs
+++ b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNet.PipelineCore
                 _bodyStream = body;
                 if (!_bodyStream.CanSeek)
                 {
-                    MemoryStream buffer = new MemoryStream();
+                    var buffer = new MemoryStream();
                     await _bodyStream.CopyToAsync(buffer, 4096, cancel);
                     _bodyStream = buffer;
                     _request.Fetch(_features).Body = _bodyStream;