diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-07 16:27:32 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-07 16:27:32 -0700 |
| commit | 05934d24aff62d66fc62621aa38dae6456e276be (patch) | |
| tree | 023e885bacfa80c9c3fb2a305c0d396bb9c83fcc | |
| parent | 869b007172af30fdaac012467424750cde65da23 (diff) | |
| download | rails-05934d24aff62d66fc62621aa38dae6456e276be.tar.gz rails-05934d24aff62d66fc62621aa38dae6456e276be.tar.bz2 rails-05934d24aff62d66fc62621aa38dae6456e276be.zip | |
deprecate the env method on controller instances
people should be accessing request information through the request
object, not via the env hash. If they really really want at the env
hash, then they can get it off the request.
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 82e543e033..914b0d4b30 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/array/extract_options' require 'action_dispatch/middleware/stack' +require 'active_support/deprecation' module ActionController # Extend ActionDispatch middleware stack to make it aware of options @@ -119,6 +120,7 @@ module ActionController def env @_request.env end + deprecate :env # Returns the last part of the controller's name, underscored, without the ending # <tt>Controller</tt>. For instance, PostsController returns <tt>posts</tt>. diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index af31de1f3a..a6115674aa 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -199,7 +199,7 @@ module ActionController #:nodoc: def _process_options(options) #:nodoc: super if options[:stream] - if env["HTTP_VERSION"] == "HTTP/1.0" + if request.version == "HTTP/1.0" options.delete(:stream) else headers["Cache-Control"] ||= "no-cache" diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index c5b07e717f..de28cd0998 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -35,7 +35,7 @@ module ActionDispatch HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_NEGOTIATE HTTP_PRAGMA HTTP_CLIENT_IP - HTTP_X_FORWARDED_FOR + HTTP_X_FORWARDED_FOR HTTP_VERSION ].freeze ENV_METHODS.each do |env| |