Merge pull request #2512 from danbarua/master

Replace dependency on RequestStream in Request.Body with Stream

src/Nancy/Request.cs

@@ -47,7 +47,7 @@ public Request(string method, string path, string scheme)
         /// <param name="protocolVersion">The HTTP protocol version.</param>
         public Request(string method,
             Url url,
-            RequestStream body = null,
+            Stream body = null,
             IDictionary<string, IEnumerable<string>> headers = null,
             string ip = null,
             X509Certificate certificate = null,
@@ -148,10 +148,10 @@ public string Path
         public dynamic Query { get; set; }
 
         /// <summary>
-        /// Gets a <see cref="RequestStream"/> that can be used to read the incoming HTTP body
+        /// Gets a <see cref="Stream"/> that can be used to read the incoming HTTP body
         /// </summary>
-        /// <value>A <see cref="RequestStream"/> object representing the incoming HTTP body.</value>
-        public RequestStream Body { get; private set; }
+        /// <value>A <see cref="Stream"/> object representing the incoming HTTP body.</value>
+        public Stream Body { get; private set; }
 
         /// <summary>
         /// Gets the request cookies.

test/Nancy.Tests.Functional/Modules/SerializerTestModule.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Globalization;
     using Nancy.Extensions;
+    using Nancy.IO;
     using Nancy.ModelBinding;
 
     public class SerializerTestModule : NancyModule
@@ -25,7 +26,7 @@ public SerializerTestModule()
 
             Post("/serializer/date", args =>
             {
-                var s = this.Request.Body.AsString();
+                var s = ((RequestStream)this.Request.Body).AsString();
                 var model = this.Bind<FakeSerializerModel>();
                 return model;
             });