From 92388f7faf80bcc68f496a8633e8d5b4748e0cf8 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 20 Mar 2018 19:31:01 +0100
Subject: [PATCH] session: update defaults for ConnMaxLifetime

to be the same as the 5.0.3 release defaults
---
 conf/defaults.ini      | 3 +++
 pkg/setting/setting.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 557c5e49ee1..11d173d955d 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -128,6 +128,9 @@ cookie_secure = false
 session_life_time = 86400
 gc_interval_time = 86400
 
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+conn_max_lifetime = 14400
+
 #################################### Data proxy ###########################
 [dataproxy]
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index c19043c69d0..5b79e866964 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -636,7 +636,7 @@ func readSessionConfig() {
 		SessionOptions.CookiePath = "/"
 	}
 
-	SessionConnMaxLifetime = Cfg.Section("session").Key("conn_max_lifetime").MustInt64(0)
+	SessionConnMaxLifetime = Cfg.Section("session").Key("conn_max_lifetime").MustInt64(14400)
 }
 
 func initLogging() {