Merge branch 'develop'

giraffe-fsharp · Dec 19, 2017 · b85e91c · b85e91c
2 parents a503ad0 + d64af1d
commit b85e91c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+## 0.1.0-beta-511
+
+#### Bug fixes
+
+- Fixed `ReadBodyFromRequestAsync` where the stream has been disposed before read could complete.
+
 ## 0.1.0-beta-510
 
 #### Improvements

diff --git a/src/Giraffe/Giraffe.fsproj b/src/Giraffe/Giraffe.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Giraffe</AssemblyName>
-    <Version>0.1.0-beta-510</Version>
+    <Version>0.1.0-beta-511</Version>
     <Description>A native functional ASP.NET Core web framework for F# developers.</Description>
     <Copyright>Copyright 2017 Dustin Moris Gorski</Copyright>
     <NeutralLanguage>en-GB</NeutralLanguage>

diff --git a/src/Giraffe/HttpContextExtensions.fs b/src/Giraffe/HttpContextExtensions.fs
@@ -61,8 +61,10 @@ type HttpContext with
     /// ---------------------------
 
     member this.ReadBodyFromRequestAsync() =
-        use reader = new StreamReader(this.Request.Body, Text.Encoding.UTF8)
-        reader.ReadToEndAsync()
+        task {
+            use reader = new StreamReader(this.Request.Body, Text.Encoding.UTF8)
+            return! reader.ReadToEndAsync()
+        }
 
     member this.BindJsonAsync<'T>() = this.BindJsonAsync<'T> defaultJsonSerializerSettings