Just reading flash messages should not create a session if one does not exist yet.

2 files changed, 12 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 6b611823d0..fd23b1df79 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -194,9 +194,12 @@ module ActionDispatch
       @env['rack.input']
     end
 
+    # TODO This should be broken apart into AD::Request::Session and probably
+    # be included by the session middleware.
     def reset_session
       session.destroy if session
       self.session = {}
+      @env['action_dispatch.request.flash_hash'] = nil
     end
 
     def session=(session) #:nodoc:
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 18771fe782..bfa30cf5af 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -4,7 +4,7 @@ module ActionDispatch
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      session['flash'] ||= Flash::FlashHash.new
+      @env['action_dispatch.request.flash_hash'] ||= (session["flash"] || Flash::FlashHash.new)
     end
   end
 
@@ -176,7 +176,14 @@ module ActionDispatch
 
       @app.call(env)
     ensure
-      if (session = env['rack.session']) && session.key?('flash') && session['flash'].empty?
+      session    = env['rack.session'] || {}
+      flash_hash = env['action_dispatch.request.flash_hash']
+
+      if flash_hash && (!flash_hash.empty? || session.key?('flash'))
+        session["flash"] = flash_hash
+      end
+
+      if session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end