Merge branch 'develop' of https://github.com/astaxie/beego into develop

@@ -40,7 +40,7 @@ func TestCache(t *testing.T) {
 	}
 	}
 
 
 	if err = bm.Decr("astaxie"); err != nil {
 	if err = bm.Decr("astaxie"); err != nil {
-		t.Error("Incr Error", err)
+		t.Error("Decr Error", err)
 	}
 	}
 
 
 	if v := bm.Get("astaxie"); v.(int) != 1 {
 	if v := bm.Get("astaxie"); v.(int) != 1 {
@@ -77,7 +77,7 @@ func TestFileCache(t *testing.T) {
 	}
 	}
 
 
 	if err = bm.Decr("astaxie"); err != nil {
 	if err = bm.Decr("astaxie"); err != nil {
-		t.Error("Incr Error", err)
+		t.Error("Decr Error", err)
 	}
 	}
 
 
 	if v := bm.Get("astaxie"); v.(int) != 1 {
 	if v := bm.Get("astaxie"); v.(int) != 1 {

@@ -73,7 +73,8 @@ func (st *CookieSessionStore) SessionRelease(w http.ResponseWriter) {
 		Value:    url.QueryEscape(str),
 		Value:    url.QueryEscape(str),
 		Path:     "/",
 		Path:     "/",
 		HttpOnly: true,
 		HttpOnly: true,
-		Secure:   cookiepder.config.Secure}
+		Secure:   cookiepder.config.Secure,
+		MaxAge:   cookiepder.config.Maxage}
 	http.SetCookie(w, cookie)
 	http.SetCookie(w, cookie)
 	return
 	return
 }
 }