From a24c0b92e4ad847fbd774e604e80017368f25495 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 10 Apr 2014 23:02:08 +0800
Subject: bug fixed

---
 routers/repo/http.go | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'routers/repo/http.go')

diff --git a/routers/repo/http.go b/routers/repo/http.go
index 993de51f..5aa3139f 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -82,7 +82,8 @@ func Http(ctx *middleware.Context, params martini.Params) {
 			return
 		}
 
-		newUser := &models.User{Passwd: passwd}
+		newUser := &models.User{Passwd: passwd, Salt: authUser.Salt}
+
 		newUser.EncodePasswd()
 		if authUser.Passwd != newUser.Passwd {
 			ctx.Handle(401, "no basic auth and digit auth", nil)
@@ -112,7 +113,10 @@ func Http(ctx *middleware.Context, params martini.Params) {
 		}
 	}
 
-	config := Config{base.RepoRootPath, "git", true, true}
+	config := Config{base.RepoRootPath, "git", true, true, func(rpc string, input []byte) {
+		//fmt.Println("rpc:", rpc)
+		//fmt.Println("input:", string(input))
+	}}
 
 	handler := HttpBackend(&config)
 	handler(ctx.ResponseWriter, ctx.Req)
@@ -135,11 +139,11 @@ type route struct {
 }
 
 type Config struct {
-	ReposRoot     string
-	GitBinPath    string
-	UploadPack    bool
-	ReceivePack   bool
-	OnPushSucceed func()
+	ReposRoot   string
+	GitBinPath  string
+	UploadPack  bool
+	ReceivePack bool
+	OnSucceed   func(rpc string, input []byte)
 }
 
 type handler struct {
@@ -243,7 +247,9 @@ func serviceRpc(rpc string, hr handler) {
 	io.Copy(w, stdout)
 	cmd.Wait()
 
-	hr.Config.OnPushSucceed()
+	if hr.Config.OnSucceed != nil {
+		hr.Config.OnSucceed(rpc, input)
+	}
 }
 
 func getInfoRefs(hr handler) {
-- 
cgit v1.2.3