2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 18504eba6d..b2566c4820 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -324,7 +324,7 @@ module ActionDispatch
       else
         self.session = {}
       end
-      set_header('action_dispatch.request.flash_hash', nil)
+      self.flash = nil
     end
 
     def session=(session) #:nodoc:
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index d1e1f1fcf6..45ffacd6f5 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -402,7 +402,7 @@ module ActionDispatch # :nodoc:
     end
 
     def rack_response(status, header)
-      if NO_CONTENT_CODES.include?(@status)
+      if NO_CONTENT_CODES.include?(status)
         header.delete CONTENT_TYPE
         header.delete 'Content-Length'
         [status, header, []]