diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2016-01-19 13:33:51 -0600 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2016-01-19 13:33:51 -0600 |
| commit | a4c82d8e6473ac125929dc2a652eeea348a37246 (patch) | |
| tree | 821d1033bf2dcba0836a925bc9876336ab6861cb | |
| parent | 71491c631f9a8c63d9c09bf887a34d1eeb74bcca (diff) | |
| parent | 067c52f608568e35181830a5c1016e382650e655 (diff) | |
| download | rails-a4c82d8e6473ac125929dc2a652eeea348a37246.tar.gz rails-a4c82d8e6473ac125929dc2a652eeea348a37246.tar.bz2 rails-a4c82d8e6473ac125929dc2a652eeea348a37246.zip | |
Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assets
Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped or not
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/static_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index 41c220236a..3eab3795a0 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -65,7 +65,7 @@ module ActionDispatch status, headers, body = @file_server.call(request.env) end - headers['Vary'] = 'Accept-Encoding' if gzip_path + headers['Vary'] = 'Accept-Encoding' return [status, headers, body] ensure diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index ea8b5e904e..24994c8adb 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -233,7 +233,7 @@ module StaticTests def assert_html(body, response) assert_equal body, response.body assert_equal "text/html", response.headers["Content-Type"] - assert_nil response.headers["Vary"] + assert_not_nil response.headers["Vary"] end def get(path, headers = {}) |