1 files changed, 6 insertions, 7 deletions
diff --git a/modules/lfs/server.go b/modules/lfs/server.go
index 226bcbf55a..be21a4de82 100644
--- a/modules/lfs/server.go
+++ b/modules/lfs/server.go
@@ -22,7 +22,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
 
-	"gitea.com/macaron/macaron"
 	"github.com/dgrijalva/jwt-go"
 )
 
@@ -413,8 +412,8 @@ func PutHandler(ctx *context.Context) {
 	}
 
 	contentStore := &ContentStore{ObjectStorage: storage.LFS}
-	defer ctx.Req.Request.Body.Close()
-	if err := contentStore.Put(meta, ctx.Req.Request.Body); err != nil {
+	defer ctx.Req.Body.Close()
+	if err := contentStore.Put(meta, ctx.Req.Body); err != nil {
 		// Put will log the error itself
 		ctx.Resp.WriteHeader(500)
 		if err == errSizeMismatch || err == errHashMismatch {
@@ -513,7 +512,7 @@ func Represent(rv *RequestVars, meta *models.LFSMetaObject, download, upload boo
 
 // MetaMatcher provides a mux.MatcherFunc that only allows requests that contain
 // an Accept header with the metaMediaType
-func MetaMatcher(r macaron.Request) bool {
+func MetaMatcher(r *http.Request) bool {
 	mediaParts := strings.Split(r.Header.Get("Accept"), ";")
 	mt := mediaParts[0]
 	return mt == metaMediaType
@@ -530,7 +529,7 @@ func unpack(ctx *context.Context) *RequestVars {
 
 	if r.Method == "POST" { // Maybe also check if +json
 		var p RequestVars
-		bodyReader := r.Body().ReadCloser()
+		bodyReader := r.Body
 		defer bodyReader.Close()
 		dec := json.NewDecoder(bodyReader)
 		err := dec.Decode(&p)
@@ -553,7 +552,7 @@ func unpackbatch(ctx *context.Context) *BatchVars {
 	r := ctx.Req
 	var bv BatchVars
 
-	bodyReader := r.Body().ReadCloser()
+	bodyReader := r.Body
 	defer bodyReader.Close()
 	dec := json.NewDecoder(bodyReader)
 	err := dec.Decode(&bv)
@@ -586,7 +585,7 @@ func writeStatus(ctx *context.Context, status int) {
 	logRequest(ctx.Req, status)
 }
 
-func logRequest(r macaron.Request, status int) {
+func logRequest(r *http.Request, status int) {
 	log.Debug("LFS request - Method: %s, URL: %s, Status %d", r.Method, r.URL, status)
 }