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

Update to Rails 2.3.8

Browse source
This commit is contained in:
Jacques Distler 2010-05-25 12:45:45 -05:00
parent 6677b46cb4
commit f0635301aa
429 changed files with 17683 additions and 4047 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vendor/rails/actionpack/lib/action_controller/response.rb vendored
View file

@ -117,11 +117,7 @@ module ActionController # :nodoc:
end
def etag=(etag)
if etag.blank?
headers.delete('ETag')
else
headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
end
headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
end
def redirect(url, status)
@ -202,7 +198,7 @@ module ActionController # :nodoc:
def nonempty_ok_response?
ok = !status || status.to_s[0..2] == '200'
ok && body.is_a?(String) && !body.empty?
ok && body.is_a?(String) && !body.blank?
end
def set_conditional_cache_control!
@ -233,7 +229,8 @@ module ActionController # :nodoc:
end
def convert_cookies!
headers['Set-Cookie'] = Array(headers['Set-Cookie']).compact
cookies = Array(headers['Set-Cookie']).compact
headers['Set-Cookie'] = cookies unless cookies.empty?
end
end
end