Revert "Session GC fix: save session.modified field as UTC so our comparisons work...

This reverts commit a7abb2323e7d57125b9fbc903a1cecc06c27944e.

diff --git a/classes/Session.php b/classes/Session.php
index b9daf364dba58e7b5e7881cef4ed2ffab214595a..166b89815a85bd42cee95381cc8b7f5484f16633 100644 (file)
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -87,7 +87,6 @@ class Session extends Memcached_DataObject
             $session->id           = $id;
             $session->session_data = $session_data;
             $session->created      = common_sql_now();
-            $session->modified     = common_sql_now();
 
             $result = $session->insert();
 
@@ -109,7 +108,6 @@ class Session extends Memcached_DataObject
                 $orig = clone($session);
 
                 $session->session_data = $session_data;
-                $session->modified     = common_sql_now();
 
                 $result = $session->update($orig);
 

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 29fde93b5d497a347e9e005eb15b86c3607ea81d..ef631e28d376668940e579f05cc0a300ad14cab4 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -513,20 +513,7 @@ profile_id = K
 id = 130
 session_data = 34
 created = 142
-modified = 142
-; Warning: using DB_DATAOBJECT_MYSQLTIMESTAMP (256) causes DB_DataObject
-; to SILENTLY REMOVE ATTEMPTS TO SET THIS FIELD DIRECTLY, which is pretty
-; bad because the default behavior for auto-updated TIMESTAMP fields is
-; to use local time. Local time can't be compared to UTC in any useful
-; way, so doing that breaks session GC.
-;
-; Instead we'll use the plain datetime settings so it'll actually save the
-; UTC value we provide when updating.
-;
-; Long-term fix: punch MySQL in the face until it understands that local
-; time is a tool of the cyber-devil.
-;
-;modified = 384
+modified = 384
 
 [session__keys]
 id = K