Permalink
Browse files

Made caching work for WEBrick and lighttpd by appending .html for all…

… URLs not already containing a dot

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 69d0f50 commit e4f07888ceca3c2ac11818a45cc3374537737e8e @dhh dhh committed Feb 20, 2005
@@ -90,11 +90,7 @@ def caches_page(*actions)
private
def page_cache_path(path)
- if path[-1,1] == '/'
- page_cache_directory + path + '/index'
- else
- page_cache_directory + path
- end
+ page_cache_directory + path + ".html"
end
end
@@ -115,13 +111,14 @@ def expire_page(options = {})
# If no options are provided, the current +options+ for this action is used. Example:
# cache_page "I'm the cached content", :controller => "lists", :action => "show"
def cache_page(content = nil, options = {})
+ logger.info "Cached page: #{options.inspect} || #{caching_allowed}"
return unless perform_caching && caching_allowed
self.class.cache_page(content || @response.body, url_for(options.merge({ :only_path => true })))
end
private
def caching_allowed
- !@request.post? && (@request.parameters.reject { |k, v| %w( id action controller ).include?(k) }).empty?
+ !@request.post?
end
end
@@ -5,8 +5,9 @@ def self.append_features(base)
base.helper do
def render_component(options)
@controller.logger.info("Start rendering component (#{options.inspect}): ")
- @controller.send(:component_response, options).body
+ result = @controller.send(:component_response, options).body
@controller.logger.info("\n\nEnd of component rendering")
+ return result
end
end
end
@@ -15,8 +16,9 @@ def render_component(options)
def render_component(options = {}) #:doc:
response = component_response(options)
logger.info "Rendering component (#{options.inspect}): "
- render_text(response.body, response.headers["Status"])
+ result = render_text(response.body, response.headers["Status"])
logger.info("\n\nEnd of component rendering")
+ return result
end
private
@@ -6,6 +6,7 @@
include WEBrick
+
class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
REQUEST_MUTEX = Mutex.new
@@ -42,16 +43,28 @@ def do_GET(req, res)
def handle_file(req, res)
begin
+ add_dot_html(req)
@file_handler.send(:do_GET, req, res)
+ remove_dot_html(req)
return true
rescue HTTPStatus::PartialContent, HTTPStatus::NotModified => err
res.set_error(err)
return true
rescue => err
return false
+ ensure
+ remove_dot_html(req)
end
end
+ def add_dot_html(req)
+ if /^([^.]+)$/ =~ req.path then req.instance_variable_set(:@path_info, "#{$1}.html") end
+ end
+
+ def remove_dot_html(req)
+ if /^([^.]+).html$/ =~ req.path then req.instance_variable_set(:@path_info, $1) end
+ end
+
def handle_dispatch(req, res, origin = nil)
env = req.meta_vars.clone
env["QUERY_STRING"] = req.request_uri.query

0 comments on commit e4f0788

Please sign in to comment.