deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #960 from agorf/master

Browse source 
Loading an image repeatedly in the server throws a 500 Internal Server Error
This commit is contained in:
Thomas Reynolds 2013-07-12 19:33:33 -07:00
commit c0192e2849
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
middleman-core/lib/middleman-core/core_extensions/request.rb
View file

@ -291,8 +291,13 @@ module Middleman
file = ::Rack::File.new nil file = ::Rack::File.new nil
file.path = resource.source_file file.path = resource.source_file
response = file.serving(env) response = file.serving(env)
status = response[0]
response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext) response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
response[1]['Content-Type'] = resource.content_type || "application/octet-stream" # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
# Rack will throw an error (500)
if !(100..199).include?(status) && ![204, 205, 304].include?(status)
response[1]['Content-Type'] = resource.content_type || "application/octet-stream"
end
halt response halt response
end end
end end