Delegate controller.session to request.session and deprecate response session

2 files changed, 5 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 0b8909ced7..2602b344ca 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -451,14 +451,6 @@ EOM
       @env['rack.input']
     end
 
-    def session
-      @env['rack.session']
-    end
-
-    def session_options
-      @env['rack.session.options']
-    end
-
     def reset_session
       self.session_options.delete(:id)
       self.session = {}
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 6c92fb9713..ebba4eefa0 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -40,7 +40,11 @@ module ActionDispatch # :nodoc:
     attr_writer :header
     alias_method :headers=, :header=
 
-    delegate :session, :to => :request
+    def session
+      ActiveSupport::Deprecation.warn("response.session has been deprecated. Use request.session instead", caller)
+      request.session
+    end
+
     delegate :default_charset, :to => 'ActionController::Base'
 
     def initialize