From 1c0155bc9d887c89106d00a339863de51a6398aa Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 13 Dec 2003 13:00:47 +0000
Subject: [PATCH] - Fixed race condition in session handler.  Patch by Kjartan.

---
 includes/session.inc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/includes/session.inc b/includes/session.inc
index 1b88ebc9f55..753b55d1e2d 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 session_set_save_handler("sess_open", "sess_close", "sess_read", "sess_write", "sess_destroy", "sess_gc");
 session_start();
@@ -16,12 +17,11 @@ function sess_close() {
 function sess_read($key) {
   global $user;
 
-  if ($key) {
-    $result = db_query_range("SELECT u.*, s.*, r.name AS role FROM {users} u INNER JOIN {role} r ON u.rid = r.rid INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s' AND u.status < 3", $key, 0, 1);
-  }
+  $result = db_query_range("SELECT u.*, s.*, r.name AS role FROM {users} u INNER JOIN {role} r ON u.rid = r.rid INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s' AND u.status < 3", $key, 0, 1);
 
   if (!db_num_rows($result)) {
     $result = db_query("SELECT u.*, r.name AS role FROM {users} u INNER JOIN {role} r ON u.rid = r.rid WHERE u.uid = 0");
+    db_query("INSERT INTO {sessions} (uid, sid, hostname, session, timestamp) values(%d, '%s', '%s', '%s', %d)", $user->uid, $key, $_SERVER["REMOTE_ADDR"], $value, time());
   }
 
   $user = db_fetch_object($result);
@@ -41,17 +41,11 @@ function sess_write($key, $value) {
 
   db_query("UPDATE {sessions} SET uid = %d, hostname = '%s', session = '%s', timestamp = %d WHERE sid = '%s'", $user->uid, $_SERVER["REMOTE_ADDR"], $value, time(), $key);
 
-  if (!db_affected_rows()) {
-    db_query("INSERT INTO {sessions} (uid, sid, hostname, session, timestamp) values(%d, '%s', '%s', '%s', %d)", $user->uid, $key, $_SERVER["REMOTE_ADDR"], $value, time());
-  }
-
   return '';
 }
 
 function sess_destroy($key) {
-
   db_query("DELETE FROM {sessions} WHERE sid = '$key'");
-
 }
 
 function sess_gc($lifetime) {