Merge branch 'develop'

nulab · Sep 12, 2018 · 3f35dbe · 3f35dbe
2 parents 435d058 + 8c1746f
commit 3f35dbe
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/githttpxfer/githttpxfer.go b/githttpxfer/githttpxfer.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"regexp"
 	"strings"
+	"sync"
 )
 
 var (
@@ -287,7 +288,9 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 		return
 	}
 
-	if _, err := io.Copy(stdin, body); err != nil {
+	bufIn := bufPool.Get().([]byte)
+	defer bufPool.Put(bufIn)
+	if _, err := io.CopyBuffer(stdin, body, bufIn); err != nil {
 		ghx.logger.Error("failed to write the request body to standard input. ", err.Error())
 		RenderInternalServerError(res.Writer)
 		return
@@ -299,7 +302,9 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 	res.SetContentType(fmt.Sprintf("application/x-git-%s-result", rpc))
 	res.WriteHeader(http.StatusOK)
 
-	if _, err := io.Copy(res.Writer, stdout); err != nil {
+	bufOut := bufPool.Get().([]byte)
+	defer bufPool.Put(bufOut)
+	if _, err := io.CopyBuffer(res.Writer, stdout, bufOut); err != nil {
 		ghx.logger.Error("failed to write the standard output to response. ", err.Error())
 		return
 	}
@@ -309,6 +314,12 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 	}
 }
 
+var bufPool = sync.Pool{
+	New: func() interface{} {
+		return make([]byte, 32*1024)
+	},
+}
+
 func (ghx *GitHTTPXfer) getInfoRefs(ctx Context) {
 	res, req, repoPath := ctx.Response(), ctx.Request(), ctx.RepoPath()