aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG5
-rw-r--r--actionpack/lib/action_controller/caching.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index cb6f934860..2e47b00188 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed that caching the root would result in .html not index.html
+
+
*1.5.0* (24th February, 2005)
* Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index c51e0f4d70..cde5b4f1e9 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -90,7 +90,7 @@ module ActionController #:nodoc:
private
def page_cache_file(path)
- (path.empty? ? "/index" : path) + ".html"
+ ((path.empty? || path == "/") ? "/index" : path) + ".html"
end
def page_cache_path(path)