In .:

2006-09-03  Robert Jordan  <robertj@gmx.net>

	* SessionSQLServerHandler.cs: persist and handle the "timeout" and
	"expire" properties of the session. Fixes bug #78281.
	Patch by Boris Dores <babal@via.ecp.fr>.

svn path=/trunk/mcs/; revision=64830

diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index ca98b090b82d2e405138e4ad0980e263b27ee02b..9d0533c0bbdd66d283340295cab3bd36a9816d64 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03  Robert Jordan  <robertj@gmx.net>
+
+       * SessionSQLServerHandler.cs: persist and handle the "timeout" and
+       "expire" properties of the session. Fixes bug #78281.
+       Patch by Boris Dores <babal@via.ecp.fr>.
+
 2006-08-08  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * SessionInProcHandler.jvm.cs:

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
index b0c66030e519af2f71457e33c18461f44cedad88..6a282c107e016a9e3031647415b27cd2988496f2 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
@@ -50,9 +50,9 @@ namespace System.Web.SessionState {
                 
                const string defaultParamPrefix = ":";
                string paramPrefix;
-               string selectCommand = "SELECT * FROM ASPStateTempSessions WHERE SessionID = :SessionID";
+               string selectCommand = "SELECT * FROM ASPStateTempSessions WHERE SessionID = :SessionID AND Expires > :Expires";
                string insertCommand = "INSERT INTO ASPStateTempSessions VALUES (:SessionID, :Created, :Expires, :Timeout, :StaticObjectsData, :SessionData)";
-               string updateCommand = "UPDATE ASPStateTempSessions SET SessionData = :SessionData WHERE SessionId = :SessionID";
+               string updateCommand = "UPDATE ASPStateTempSessions SET expires = :Expires, timeout = :Timeout, SessionData = :SessionData WHERE SessionId = :SessionID";
                string deleteCommand = "DELETE FROM ASPStateTempSessions WHERE SessionId = :SessionID";
 
                public void Dispose ()
@@ -118,7 +118,7 @@ namespace System.Web.SessionState {
                        string id = session.SessionID;
                        if (!session._abandoned) {
                                SessionDictionary dict = session.SessionDictionary;
-                               UpdateSessionWithRetry (id, dict);
+                               UpdateSessionWithRetry (id, session.Timeout, dict);
                        } else {
                                DeleteSessionWithRetry (id);
                        }
@@ -195,6 +195,7 @@ namespace System.Web.SessionState {
                        command = cnc.CreateCommand();
                        command.CommandText = selectCommand;
                        command.Parameters.Add (CreateParam (command, DbType.String, "SessionID", id));
+                       command.Parameters.Add (CreateParam (command, DbType.DateTime, "Expires", DateTime.Now ));
                        return command.ExecuteReader ();
                }
 
@@ -223,11 +224,14 @@ namespace System.Web.SessionState {
 
                                SessionDictionary dict; 
                                HttpStaticObjectsCollection sobjs;
+                               int timeout;
                                
                                dict = SessionDictionary.FromByteArray (ReadBytes (reader, reader.FieldCount-1));
                                sobjs = HttpStaticObjectsCollection.FromByteArray (ReadBytes (reader, reader.FieldCount-2));
+                               // try to support as many DBs/int types as possible
+                               timeout = Convert.ToInt32 (reader.GetValue (reader.FieldCount-3));
                                
-                               session = new HttpSessionState (id, dict, sobjs, 100, false, config.CookieLess,
+                               session = new HttpSessionState (id, dict, sobjs, timeout, false, config.CookieLess,
                                                SessionStateMode.SQLServer, read_only);
                                return session;
                        }
@@ -243,7 +247,7 @@ namespace System.Web.SessionState {
                        param = command.Parameters;
                        param.Add (CreateParam (command, DbType.String, "SessionID", session.SessionID));
                        param.Add (CreateParam (command, DbType.DateTime, "Created", DateTime.Now));
-                       param.Add (CreateParam (command, DbType.DateTime, "Expires", Tommorow ()));
+                       param.Add (CreateParam (command, DbType.DateTime, "Expires", DateTime.Now.AddMinutes (timeout)));
                        param.Add (CreateParam (command, DbType.Int32, "Timeout", timeout));
                        param.Add (CreateParam (command, DbType.Binary, "StaticObjectsData",
                                                   session.StaticObjects.ToByteArray ()));
@@ -270,7 +274,7 @@ namespace System.Web.SessionState {
                        InsertSession (session, timeout);
                }
 
-               void UpdateSession (string id, SessionDictionary dict)
+               void UpdateSession (string id, int timeout, SessionDictionary dict)
                {
                        IDbCommand command = cnc.CreateCommand ();
                        IDataParameterCollection param;
@@ -279,16 +283,18 @@ namespace System.Web.SessionState {
 
                        param = command.Parameters;
                        param.Add (CreateParam (command, DbType.String, "SessionID", id));
+                       param.Add (CreateParam (command, DbType.DateTime, "Expires", DateTime.Now.AddMinutes (timeout)));
+                       param.Add (CreateParam (command, DbType.Int32, "Timeout", timeout));
                        param.Add (CreateParam (command, DbType.Binary, "SessionData",
                                                                dict.ToByteArray ()));
 
                        command.ExecuteNonQuery ();
                }
 
-               void UpdateSessionWithRetry (string id, SessionDictionary dict)
+               void UpdateSessionWithRetry (string id, int timeout, SessionDictionary dict)
                {
                        try {
-                               UpdateSession (id, dict);
+                               UpdateSession (id, timeout, dict);
                                return;
                        } catch {
                        }
@@ -299,7 +305,7 @@ namespace System.Web.SessionState {
                        }
 
                        cnc.Open ();
-                       UpdateSession (id, dict);
+                       UpdateSession (id, timeout, dict);
                }
 
                void DeleteSession (string id)
@@ -340,11 +346,6 @@ namespace System.Web.SessionState {
                        return result;
                }
 
-               private DateTime Tommorow ()
-               {
-                       return DateTime.Now.AddDays (1);
-               }
-
                private byte [] ReadBytes (IDataReader reader, int index)
                {
                        int len = (int) reader.GetBytes (reader.FieldCount-1, 0, null, 0, 0);