diff options
| author | Kohei Suzuki <eagletmt@gmail.com> | 2015-03-12 23:14:01 +0900 |
|---|---|---|
| committer | Kohei Suzuki <eagletmt@gmail.com> | 2015-03-12 23:32:07 +0900 |
| commit | b60c1fe97be3af8baf982aaa4638811a37f7a7e9 (patch) | |
| tree | 6129a4aaab30e5e20c3e3fdfc261996f9e29ef24 /actionpack/lib/action_dispatch/middleware/static.rb | |
| parent | d4103fc232044625c6ba4692b4c9bd8779e97ba5 (diff) | |
| download | rails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.tar.gz rails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.tar.bz2 rails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.zip | |
Also skip Content-Encoding and Vary header if 304
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/static.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index f5c2acbfb9..fdd1bc4e69 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -47,10 +47,11 @@ module ActionDispatch if gzip_path && gzip_encoding_accepted?(env) env['PATH_INFO'] = gzip_path status, headers, body = @file_server.call(env) - headers['Content-Encoding'] = 'gzip' - if status != 304 - headers['Content-Type'] = content_type(path) + if status == 304 + return [status, headers, body] end + headers['Content-Encoding'] = 'gzip' + headers['Content-Type'] = content_type(path) else status, headers, body = @file_server.call(env) end |