summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-09-27 15:49:35 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-09-27 15:49:35 +0200
commitb3a84372fe82a44a016cbf12421d609b12cb1ea7 (patch)
treec98d9c494fa528af791c7cbb7f171082f6398621
parent650bf623ca839d54bc159434965d28652c1543f8 (diff)
parent21ca8cca94e969dd83e410c26920ec80822959d0 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
-rw-r--r--application/config/config.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/application/config/config.php b/application/config/config.php
index c5eae8f5b..3f2be480f 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -224,15 +224,22 @@ $config['encryption_key'] = "";
| Session Variables
|--------------------------------------------------------------------------
|
-| 'session_cookie_name' = the name you want for the cookie
-| 'encrypt_sess_cookie' = TRUE/FALSE (boolean). Whether to encrypt the cookie
-| 'session_expiration' = the number of SECONDS you want the session to last.
-| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
-| 'time_to_update' = how many seconds between CI refreshing Session Information
+| 'sess_cookie_name' = the name you want for the cookie
+| 'sess_expiration' = the number of SECONDS you want the session to last.
+| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
+| 'sess_expire_on_close' = Whether to cause the session to expire automatically
+| when the browser window is closed
+| 'sess_encrypt_cookie' = Whether to encrypt the cookie
+| 'sess_use_database' = Whether to save the session data to a database
+| 'sess_table_name' = The name of the session database table
+| 'sess_match_ip' = Whether to match the user's IP address when reading the session data
+| 'sess_match_useragent' = Whether to match the User Agent when reading the session data
+| 'sess_time_to_update' = how many seconds between CI refreshing Session Information
|
*/
$config['sess_cookie_name'] = 'ci_session';
$config['sess_expiration'] = 7200;
+$config['sess_expire_on_close'] = FALSE;
$config['sess_encrypt_cookie'] = FALSE;
$config['sess_use_database'] = FALSE;
$config['sess_table_name'] = 'ci_sessions';