aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-15 17:26:22 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-15 23:29:45 -0200
commit9669aa7cf1c50964c4729fbd50a8776a1e815b44 (patch)
treef3c5db719e0dc7b2c2d24b1059cb7be8835f2d47 /actionpack/lib
parent63970dc7db273551f977483109dde936c8a7554f (diff)
downloadrails-9669aa7cf1c50964c4729fbd50a8776a1e815b44.tar.gz
rails-9669aa7cf1c50964c4729fbd50a8776a1e815b44.tar.bz2
rails-9669aa7cf1c50964c4729fbd50a8776a1e815b44.zip
Merge pull request #8914 from nilbus/fix-header-bloat
Remove header bloat introduced by BestStandardsSupport middleware Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/best_standards_support.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/best_standards_support.rb b/actionpack/lib/action_dispatch/middleware/best_standards_support.rb
index d338996240..94efeb79fa 100644
--- a/actionpack/lib/action_dispatch/middleware/best_standards_support.rb
+++ b/actionpack/lib/action_dispatch/middleware/best_standards_support.rb
@@ -17,7 +17,9 @@ module ActionDispatch
status, headers, body = @app.call(env)
if headers["X-UA-Compatible"] && @header
- headers["X-UA-Compatible"] << "," << @header.to_s
+ unless headers["X-UA-Compatible"][@header]
+ headers["X-UA-Compatible"] << "," << @header.to_s
+ end
else
headers["X-UA-Compatible"] = @header
end