Add 'X-UA-Compatible' => 'chrome=1' to default headers

2 files changed, 5 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 2dfaab3587..edf37bb9a5 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -20,7 +20,8 @@ module ActionDispatch
     config.action_dispatch.default_headers = {
       'X-Frame-Options' => 'SAMEORIGIN',
       'X-XSS-Protection' => '1; mode=block',
-      'X-Content-Type-Options' => 'nosniff'
+      'X-Content-Type-Options' => 'nosniff',
+      'X-UA-Compatible' => 'chrome=1'
     }
 
     config.eager_load_namespaces << ActionDispatch
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 2fbe7358f9..74f5253c11 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -182,7 +182,8 @@ class ResponseTest < ActiveSupport::TestCase
       ActionDispatch::Response.default_headers = {
         'X-Frame-Options' => 'DENY',
         'X-Content-Type-Options' => 'nosniff',
-        'X-XSS-Protection' => '1;'
+        'X-XSS-Protection' => '1;',
+        'X-UA-Compatible' => 'chrome=1'
       }
       resp = ActionDispatch::Response.new.tap { |response|
         response.body = 'Hello'
@@ -192,6 +193,7 @@ class ResponseTest < ActiveSupport::TestCase
       assert_equal('DENY', resp.headers['X-Frame-Options'])
       assert_equal('nosniff', resp.headers['X-Content-Type-Options'])
       assert_equal('1;', resp.headers['X-XSS-Protection'])
+      assert_equal('chrome=1', resp.headers['X-UA-Compatible'])
     ensure
       ActionDispatch::Response.default_headers = nil
     end