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-08 20:50:11 -0200 |
| commit | 90a5ec758dfb9698ecfd59bd08340ffecbda1d75 (patch) | |
| tree | 2d942ebc8433f34600e3af8b18291a298262cb12 /actionpack/lib | |
| parent | 3d25292ae3da2e8cf7a501c69b331a8d08344c59 (diff) | |
| download | rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.tar.gz rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.tar.bz2 rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.zip | |
Merge pull request #8093 from nikitug/keep_app_x_ua_compatible
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
Conflicts:
actionpack/CHANGELOG.md
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 |