aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/headers.rb
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-03-15 02:16:52 -0700
committerAndrew White <andyw@pixeltrix.co.uk>2013-03-15 02:16:52 -0700
commitddb9040b433b00aa0206442aa718eee12bceb517 (patch)
treec87f2a7a1643772a81161b2d4ea53474df07130d /actionpack/lib/action_dispatch/http/headers.rb
parentc1003d99b00b3afb5417b6853a3e2ba92638cbe8 (diff)
parente8598a53a17da5fa909e6e5ec1d8284fca6a85f9 (diff)
downloadrails-ddb9040b433b00aa0206442aa718eee12bceb517.tar.gz
rails-ddb9040b433b00aa0206442aa718eee12bceb517.tar.bz2
rails-ddb9040b433b00aa0206442aa718eee12bceb517.zip
Merge pull request #9716 from senny/rework_headers_functional_tests
Rework headers functional tests
Diffstat (limited to 'actionpack/lib/action_dispatch/http/headers.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/headers.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 1574518a16..2666cd4b0a 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -15,8 +15,7 @@ module ActionDispatch
attr_reader :env
def initialize(env = {})
- @env = {}
- merge!(env)
+ @env = env
end
def [](key)