diff --git a/gogs.go b/gogs.go index c3f264c2d..6085cd71e 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.8.1209 Beta" +const APP_VER = "0.5.8.1210 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/base/tool.go b/modules/base/tool.go index 3c435fbdb..ff5a4f4cd 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -11,7 +11,6 @@ import ( "crypto/sha1" "encoding/base64" "encoding/hex" - "errors" "fmt" "hash" "html/template" @@ -41,15 +40,14 @@ func EncodeSha1(str string) string { return hex.EncodeToString(h.Sum(nil)) } -func BasicAuthDecode(encoded string) (user string, name string, err error) { - var s []byte - s, err = base64.StdEncoding.DecodeString(encoded) +func BasicAuthDecode(encoded string) (string, string, error) { + s, err := base64.StdEncoding.DecodeString(encoded) if err != nil { - return user, name, err + return "", "", err } auth := strings.SplitN(string(s), ":", 2) - return auth[0], auth[1], err + return auth[0], auth[1], nil } func BasicAuthEncode(username, password string) string { diff --git a/templates/.VERSION b/templates/.VERSION index f7e9d476c..e5200d182 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.8.1209 Beta \ No newline at end of file +0.5.8.1210 Beta \ No newline at end of file