diff options
| author | Paul Gallagher <gallagher.paul@gmail.com> | 2011-06-19 10:21:15 +0800 |
|---|---|---|
| committer | Paul Gallagher <gallagher.paul@gmail.com> | 2011-06-19 10:21:15 +0800 |
| commit | 2b3d67fdaf2c78a5447316a90c54c7c9c520c71a (patch) | |
| tree | 19cf0443c671ddf015c12b85e7022a2bd428b9ba /actionpack/lib/action_dispatch/http/headers.rb | |
| parent | b0d59907f733841280095b16c98a95574b3a0938 (diff) | |
| parent | 6c705e33ef78d28d5d964a03edc627f31d7f8c25 (diff) | |
| download | rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.tar.gz rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.tar.bz2 rails-2b3d67fdaf2c78a5447316a90c54c7c9c520c71a.zip | |
Merge remote branch 'rails/master' into pg_schema_fu
Diffstat (limited to 'actionpack/lib/action_dispatch/http/headers.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/headers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb index 1e43104f0a..505d5560b1 100644 --- a/actionpack/lib/action_dispatch/http/headers.rb +++ b/actionpack/lib/action_dispatch/http/headers.rb @@ -3,9 +3,10 @@ require 'active_support/memoizable' module ActionDispatch module Http class Headers < ::Hash - extend ActiveSupport::Memoizable + @@env_cache = Hash.new { |h,k| h[k] = "HTTP_#{k.upcase.gsub(/-/, '_')}" } def initialize(*args) + if args.size == 1 && args[0].is_a?(Hash) super() update(args[0]) @@ -25,9 +26,8 @@ module ActionDispatch private # Converts a HTTP header name to an environment variable name. def env_name(header_name) - "HTTP_#{header_name.upcase.gsub(/-/, '_')}" + @@env_cache[header_name] end - memoize :env_name end end end |