aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/static.rb2
-rw-r--r--actionpack/test/dispatch/static_test.rb2
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 3eab3795a0..41c220236a 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'
+ headers['Vary'] = 'Accept-Encoding' if gzip_path
return [status, headers, body]
ensure
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 24994c8adb..ea8b5e904e 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_not_nil response.headers["Vary"]
+ assert_nil response.headers["Vary"]
end
def get(path, headers = {})