From 3e48d2eee1d2af42aa777fd5e461fa570762732e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 21 Nov 2008 13:19:30 -0500
Subject: [PATCH] - Increase speed of session destroy and garbage clean up - Fix session timeout when DB server got clock skew (#1485490)
---
program/include/session.inc | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/program/include/session.inc b/program/include/session.inc
index d6486a4..21d22ab 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -75,10 +75,12 @@
WHERE sess_id=?",
$key);
+ $now = $DB->fromunixtime(time());
+
if ($DB->num_rows($sql_result)) {
$DB->query(
"UPDATE " . get_table_name('session') . "
- SET vars=?, changed=" . $DB->now() . "
+ SET vars=?, changed= " . $now . "
WHERE sess_id=?",
$vars,
$key);
@@ -87,7 +89,7 @@
$DB->query(
"INSERT INTO " . get_table_name('session') . "
(sess_id, vars, ip, created, changed)
- VALUES (?, ?, ?, ".$DB->now().", ".$DB->now().")",
+ VALUES (?, ?, ?, " . $now . ", " . $now .")",
$key,
$vars,
(string)$_SERVER['REMOTE_ADDR']);
@@ -107,12 +109,13 @@
return false;
}
+ $DB->query("DELETE FROM " . get_table_name('session') . " WHERE sess_id=?", $key);
+
// delete session entries in cache table
- if ($rcmail->config->get('enable_caching')) {
+ // on databases wthout foreign keys
+ if ($rcmail->config->get('enable_caching') && $DB->db_provider != 'pgsql') {
$DB->query("DELETE FROM " . get_table_name('cache') . " WHERE session_id=?", $key);
}
-
- $DB->query("DELETE FROM " . get_table_name('session') . " WHERE sess_id=?", $key);
return true;
}
@@ -128,40 +131,39 @@
return false;
}
+ $now = $DB->fromunixtime(time() - $maxlifetime);
+
+ // delete session entries in cache table
if ($rcmail->config->get('enable_caching')) {
- // get all expired sessions
- $sql_result = $DB->query(
- "SELECT sess_id
- FROM " . get_table_name('session') . "
- WHERE " . $DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed') . " > ?",
- $maxlifetime);
-
- $exp_sessions = array();
- while ($sql_arr = $DB->fetch_assoc($sql_result)) {
- $exp_sessions[] = $sql_arr['sess_id'];
- }
- if (sizeof($exp_sessions)) {
- $exp_sessions = "'" . join("','", $exp_sessions) . "'";
- // delete session cache records
- $DB->query("DELETE FROM " . get_table_name('cache') . "
+ // on databases wthout foreign keys...
+ if($DB->db_provider != 'pgsql') {
+
+ // get all expired sessions
+ $sql_result = $DB->query(
+ "SELECT sess_id FROM " . get_table_name('session') . "
+ WHERE changed < " . $now);
+
+ $exp_sessions = array();
+ while ($sql_arr = $DB->fetch_assoc($sql_result)) {
+ $exp_sessions[] = $sql_arr['sess_id'];
+ }
+
+ if (sizeof($exp_sessions)) {
+ $exp_sessions = "'" . join("','", $exp_sessions) . "'";
+ // delete session cache records
+ $DB->query("DELETE FROM " . get_table_name('cache') . "
WHERE session_id IN (" . $exp_sessions . ")");
-
- // delete session records
- $DB->query("DELETE FROM " . get_table_name('session') . "
- WHERE sess_id IN (" . $exp_sessions . ")");
+ }
}
-
// also run message cache GC
rcmail_message_cache_gc();
-
- } else {
- // just delete all expired sessions
- $DB->query("DELETE FROM " . get_table_name('session') . "
- WHERE " . $DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed') . " > ?",
- $maxlifetime);
}
+ // just delete all expired sessions
+ $DB->query("DELETE FROM " . get_table_name('session') . "
+ WHERE changed < " . $now);
+
rcmail_temp_gc();
return true;
--
Gitblit v1.9.1