kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Also skip Content-Encoding and Vary header if 304

Browse source
This commit is contained in:
Kohei Suzuki 2015-03-12 23:14:01 +09:00
parent d4103fc232
commit b60c1fe97b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/lib/action_dispatch/middleware/static.rb
View file

@ -47,10 +47,11 @@ module ActionDispatch
if gzip_path && gzip_encoding_accepted?(env) if gzip_path && gzip_encoding_accepted?(env)
env['PATH_INFO'] = gzip_path env['PATH_INFO'] = gzip_path
status, headers, body = @file_server.call(env) status, headers, body = @file_server.call(env)
headers['Content-Encoding'] = 'gzip' if status == 304
if status != 304 return [status, headers, body]
headers['Content-Type'] = content_type(path)
end end
headers['Content-Encoding'] = 'gzip'
headers['Content-Type'] = content_type(path)
else else
status, headers, body = @file_server.call(env) status, headers, body = @file_server.call(env)
end end

3
actionpack/test/dispatch/static_test.rb
View file

@ -149,7 +149,8 @@ module StaticTests
response = get(file_name, 'HTTP_ACCEPT_ENCODING' => 'gzip', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate) response = get(file_name, 'HTTP_ACCEPT_ENCODING' => 'gzip', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate)
assert_equal 304, response.status assert_equal 304, response.status
assert_equal nil, response.headers['Content-Type'] assert_equal nil, response.headers['Content-Type']
assert_equal 'gzip', response.headers['Content-Encoding'] assert_equal nil, response.headers['Content-Encoding']
assert_equal nil, response.headers['Vary']
end end
# Windows doesn't allow \ / : * ? " < > | in filenames # Windows doesn't allow \ / : * ? " < > | in filenames