diff options
| -rw-r--r-- | actionpack/CHANGELOG | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 8 | ||||
| -rw-r--r-- | railties/CHANGELOG | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5434e4ea3d..1630a26a2b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,10 +1,14 @@ *SVN* +* Added better error handling for regexp caching expiration + +* Fixed handling of requests coming from unknown HTTP methods not to kill the server + * Added that both AssetHelper#stylesheet_link_tag and AssetHelper#javascript_include_tag now accept an option hash as the last parameter, so you can do stuff like: stylesheet_link_tag "style", :media => "all" * Added FormTagHelper#image_submit_tag for making submit buttons that uses images -* Added the option of specifying a RAILS_ASSET_HOST that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that. +* Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that. * Fixed action/fragment caching using the filestore when a directory and a file wanted to to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 28618e2427..7749b07815 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -375,7 +375,13 @@ module ActionController #:nodoc: def delete_matched(matcher, options) #:nodoc: search_dir(@cache_path) do |f| - File.delete(f) rescue nil if f =~ matcher + if f =~ matcher + begin + File.delete(f) + rescue Object => e + Base.logger.info "Couldn't expire cache: #{f} (#{e.message})" unless Base.logger.nil? + end + end end end diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f98c57459d..51d9f2023a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,5 @@ *SVN* - * Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck] * Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck] |