Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

diff --git a/classes/Session.php b/classes/Session.php
index 2422f8b68ecf975dd3794a051917f6fc495a7a02..e1c83ad4dc78564b7745d06d56cba9a087635981 100644 (file)
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -178,6 +178,18 @@ class Session extends Memcached_DataObject
         $result = session_set_save_handler('Session::open', 'Session::close', 'Session::read',
                                            'Session::write', 'Session::destroy', 'Session::gc');
         self::logdeb("save handlers result = $result");
+
+        // PHP 5.3 with APC ends up destroying a bunch of object stuff before the session
+        // save handlers get called on request teardown.
+        // Registering an explicit shutdown function should take care of this before
+        // everything breaks on us.
+        register_shutdown_function('Session::cleanup');
+        
         return $result;
     }
+
+    static function cleanup()
+    {
+        session_write_close();
+    }
 }