1 files changed, 16 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 59639a010e..c482b1c5e7 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -1,12 +1,22 @@
 require 'active_support/core_ext/hash/keys'
 
 module ActionDispatch
-  class Request < Rack::Request
+  class Request
     # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      @env[Flash::KEY] ||= Flash::FlashHash.from_session_value(session["flash"])
+      flash = flash_hash
+      return flash if flash
+      self.flash = Flash::FlashHash.from_session_value(session["flash"])
+    end
+
+    def flash=(flash)
+      set_header Flash::KEY, flash
+    end
+
+    def flash_hash # :nodoc:
+      get_header Flash::KEY
     end
   end
 
@@ -263,14 +273,15 @@ module ActionDispatch
     end
 
     def call(env)
+      req = ActionDispatch::Request.new env
       @app.call(env)
     ensure
-      session    = Request::Session.find(env) || {}
-      flash_hash = env[KEY]
+      session    = Request::Session.find(req) || {}
+      flash_hash = req.flash_hash
 
       if flash_hash && (flash_hash.present? || session.key?('flash'))
         session["flash"] = flash_hash.to_session_value
-        env[KEY] = flash_hash.dup
+        req.flash = flash_hash.dup
       end
 
       if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?)