Merge pull request #139 from issei-m/fix-session-data-lost

Fix session data losing under certain situation

Author: j0k3r

lib/response/sfWebResponse.class.php

@@ -398,6 +398,7 @@ public function send()
 
     if (function_exists('fastcgi_finish_request'))
     {
+      $this->dispatcher->notify(new sfEvent($this, 'response.fastcgi_finish_request'));
       fastcgi_finish_request();
     }
   }

lib/util/sfContext.class.php

@@ -27,7 +27,8 @@ class sfContext implements ArrayAccess
     $configuration                  = null,
     $mailerConfiguration            = array(),
     $serviceContainerConfiguration  = array(),
-    $factories                      = array();
+    $factories                      = array(),
+    $hasShutdownUserAndStorage      = false;
 
   protected static
     $instances = array(),
@@ -87,6 +88,7 @@ public function initialize(sfApplicationConfiguration $configuration)
     }
 
     $this->dispatcher->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
+    $this->dispatcher->connect('response.fastcgi_finish_request', array($this, 'shutdownUserAndStorage'));
 
     // register our shutdown function
     register_shutdown_function(array($this, 'shutdown'));
@@ -592,6 +594,22 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
     return $parameters;
   }
 
+  /**
+   * Shuts the user/storage down.
+   *
+   * @internal Should be called only via invoking "response.fastcgi_finish_request" or context shutting down.
+   */
+  public function shutdownUserAndStorage()
+  {
+    if (!$this->hasShutdownUserAndStorage && $this->has('user'))
+    {
+      $this->getUser()->shutdown();
+      $this->getStorage()->shutdown();
+
+      $this->hasShutdownUserAndStorage = true;
+    }
+  }
+
   /**
    * Calls methods defined via sfEventDispatcher.
    *
@@ -635,12 +653,7 @@ public function __call($method, $arguments)
    */
   public function shutdown()
   {
-    // shutdown all factories
-    if($this->has('user'))
-    {
-      $this->getUser()->shutdown();
-      $this->getStorage()->shutdown();
-    }
+    $this->shutdownUserAndStorage();
 
     if ($this->has('routing'))
     {