diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-01 04:42:55 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-01 04:42:55 -0700 |
| commit | 69cebae3b2201ac3c31dca8f6f29a2557831505f (patch) | |
| tree | 08957ebdb7c23f8a3e755cccb8accd63ee9af3b1 /actionpack/lib | |
| parent | b31ea0c240773c557a6c4e1a0e470a9d442406ee (diff) | |
| parent | d8c1404107501e131e4c7c653794768f5c461793 (diff) | |
| download | rails-69cebae3b2201ac3c31dca8f6f29a2557831505f.tar.gz rails-69cebae3b2201ac3c31dca8f6f29a2557831505f.tar.bz2 rails-69cebae3b2201ac3c31dca8f6f29a2557831505f.zip | |
Merge pull request #8093 from nikitug/keep_app_x_ua_compatible
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/best_standards_support.rb | 8 |
1 files changed, 7 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 69adcc419f..d338996240 100644 --- a/actionpack/lib/action_dispatch/middleware/best_standards_support.rb +++ b/actionpack/lib/action_dispatch/middleware/best_standards_support.rb @@ -15,7 +15,13 @@ module ActionDispatch def call(env) status, headers, body = @app.call(env) - headers["X-UA-Compatible"] = @header + + if headers["X-UA-Compatible"] && @header + headers["X-UA-Compatible"] << "," << @header.to_s + else + headers["X-UA-Compatible"] = @header + end + [status, headers, body] end end |