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

Do Content-negotiation for Cached Content

Browse source 
The action_cache plugin broke our content-negotiation.
Fixed.
This commit is contained in:
Jacques Distler 2007-05-28 12:48:42 -05:00
parent 5db9b7d3ea
commit dc629f5c07
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application.rb
View file

@ -144,6 +144,8 @@ class ApplicationController < ActionController::Base
end end
end end
public
def set_content_type_header def set_content_type_header
if %w(atom_with_content atom_with_headlines).include?(action_name) if %w(atom_with_content atom_with_headlines).include?(action_name)
response.headers['Content-Type'] = 'application/atom+xml; charset=UTF-8' response.headers['Content-Type'] = 'application/atom+xml; charset=UTF-8'
@ -158,6 +160,8 @@ class ApplicationController < ActionController::Base
end end
end end
protected
def set_robots_metatag def set_robots_metatag
if controller_name == 'wiki' and %w(show published).include? action_name if controller_name == 'wiki' and %w(show published).include? action_name
@robots_metatag_value = 'index,follow' @robots_metatag_value = 'index,follow'

1
vendor/plugins/action_cache/lib/action_cache.rb vendored
View file

@ -141,6 +141,7 @@ module ActionController
def send_cached_response(cache_entry, controller) def send_cached_response(cache_entry, controller)
controller.logger.info "Send #{body_name(controller)} by response.body" controller.logger.info "Send #{body_name(controller)} by response.body"
controller.response.headers = cache_entry.headers controller.response.headers = cache_entry.headers
controller.set_content_type_header
controller.response.body = fragment_body(controller) controller.response.body = fragment_body(controller)
end end