From 15242d89ce16b2f96573a63f13d53f8a592ffd40 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 4 Nov 2014 19:08:06 +0800
Subject: [PATCH] simple the session init

---
 admin.go  |  2 --
 beego.go  |  2 --
 config.go | 12 ------------
 3 files changed, 16 deletions(-)

diff --git a/admin.go b/admin.go
index 273e666e..d918b595 100644
--- a/admin.go
+++ b/admin.go
@@ -113,8 +113,6 @@ func listConf(rw http.ResponseWriter, r *http.Request) {
 			m["SessionName"] = SessionName
 			m["SessionGCMaxLifetime"] = SessionGCMaxLifetime
 			m["SessionSavePath"] = SessionSavePath
-			m["SessionHashFunc"] = SessionHashFunc
-			m["SessionHashKey"] = SessionHashKey
 			m["SessionCookieLifeTime"] = SessionCookieLifeTime
 			m["UseFcgi"] = UseFcgi
 			m["MaxMemory"] = MaxMemory
diff --git a/beego.go b/beego.go
index f23174c7..8bfcf617 100644
--- a/beego.go
+++ b/beego.go
@@ -383,8 +383,6 @@ func initBeforeHttpRun() {
 				`"gclifetime":` + strconv.FormatInt(SessionGCMaxLifetime, 10) + `,` +
 				`"providerConfig":"` + filepath.ToSlash(SessionSavePath) + `",` +
 				`"secure":` + strconv.FormatBool(EnableHttpTLS) + `,` +
-				`"sessionIDHashFunc":"` + SessionHashFunc + `",` +
-				`"sessionIDHashKey":"` + SessionHashKey + `",` +
 				`"enableSetCookie":` + strconv.FormatBool(SessionAutoSetCookie) + `,` +
 				`"domain":"` + SessionDomain + `",` +
 				`"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}`
diff --git a/config.go b/config.go
index ed91647f..f4d0aba2 100644
--- a/config.go
+++ b/config.go
@@ -56,8 +56,6 @@ var (
 	SessionName            string           // the cookie name when saving session id into cookie.
 	SessionGCMaxLifetime   int64            // session gc time for auto cleaning expired session.
 	SessionSavePath        string           // if use mysql/redis/file provider, define save path to connection info.
-	SessionHashFunc        string           // session hash generation func.
-	SessionHashKey         string           // session hash salt string.
 	SessionCookieLifeTime  int              // the life time of session id in cookie.
 	SessionAutoSetCookie   bool             // auto setcookie
 	SessionDomain          string           // the cookie domain default is empty
@@ -237,8 +235,6 @@ func init() {
 	SessionName = "beegosessionID"
 	SessionGCMaxLifetime = 3600
 	SessionSavePath = ""
-	SessionHashFunc = "sha1"
-	SessionHashKey = "beegoserversessionkey"
 	SessionCookieLifeTime = 0 //set cookie default is the brower life
 	SessionAutoSetCookie = true
 
@@ -354,14 +350,6 @@ func ParseConfig() (err error) {
 		SessionSavePath = sesssavepath
 	}
 
-	if sesshashfunc := AppConfig.String("SessionHashFunc"); sesshashfunc != "" {
-		SessionHashFunc = sesshashfunc
-	}
-
-	if sesshashkey := AppConfig.String("SessionHashKey"); sesshashkey != "" {
-		SessionHashKey = sesshashkey
-	}
-
 	if sessMaxLifeTime, err := AppConfig.Int64("SessionGCMaxLifetime"); err == nil && sessMaxLifeTime != 0 {
 		SessionGCMaxLifetime = sessMaxLifeTime
 	}