Fixed fasthttp Request#SetBody

Signed-off-by: Vishal Rana <[email protected]>
chrislearn · May 1, 2016 · 368f2ab · 368f2ab
1 parent 0edb17e
commit 368f2ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/engine/fasthttp/request.go b/engine/fasthttp/request.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"mime/multipart"
 
-	"github.com/labstack/echo"
 	"github.com/labstack/echo/engine"
 	"github.com/labstack/gommon/log"
 	"github.com/valyala/fasthttp"
@@ -95,12 +94,12 @@ func (r *Request) SetURI(uri string) {
 
 // Body implements `engine.Request#Body` function.
 func (r *Request) Body() io.Reader {
-	return bytes.NewBuffer(r.PostBody())
+	return bytes.NewBuffer(r.Request.Body())
 }
 
 // SetBody implements `engine.Request#SetBody` function.
 func (r *Request) SetBody(reader io.Reader) {
-	r.SetBodyStream(reader, r.header.Get(echo.HeaderContentType))
+	r.Request.SetBodyStream(reader, 0)
 }
 
 // FormValue implements `engine.Request#FormValue` function.

diff --git a/glide.lock b/glide.lock
diff --git a/middleware/body_limit_test.go b/middleware/body_limit_test.go
@@ -18,7 +18,10 @@ func TestBodyLimit(t *testing.T) {
 	rec := test.NewResponseRecorder()
 	c := e.NewContext(req, rec)
 	h := func(c echo.Context) error {
-		body, _ := ioutil.ReadAll(c.Request().Body())
+		body, err := ioutil.ReadAll(c.Request().Body())
+		if err != nil {
+			return err
+		}
 		return c.String(http.StatusOK, string(body))
 	}
 
@@ -28,6 +31,9 @@ func TestBodyLimit(t *testing.T) {
 	assert.Equal(t, "Hello, World!", rec.Body.String())
 
 	// Overlimit
-	// BodyLimit("2B")(h)(c)
-	// assert.Equal(t, "Hello, World!", rec.Body.String())
+	req = test.NewRequest(echo.POST, "/", bytes.NewReader([]byte("Hello, World!")))
+	rec = test.NewResponseRecorder()
+	c = e.NewContext(req, rec)
+	BodyLimit("2B")(h)(c)
+	assert.Equal(t, http.StatusRequestEntityTooLarge, rec.Status())
 }