diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-01 20:41:53 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-01 20:41:53 +0000 |
| commit | dc87eba0628f88775e999cdefca945683c52e740 (patch) | |
| tree | 00636471fffd52cbfbf13eaec5f5e3abec9b8586 /actionpack | |
| parent | 12c5287e30be98d4becb4319aedd8375d45322e6 (diff) | |
| download | rails-dc87eba0628f88775e999cdefca945683c52e740.tar.gz rails-dc87eba0628f88775e999cdefca945683c52e740.tar.bz2 rails-dc87eba0628f88775e999cdefca945683c52e740.zip | |
Fixed fragment caching of binary data on Windows (closes #4493) [bellis@deepthought.org]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 61eb7c20cf..fb58a0a761 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed fragment caching of binary data on Windows #4493 [bellis@deepthought.org] + * Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us [Sam Stephenson, Thomas Fuchs] * Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [DHH]. Example: diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index a2259de46b..0cb70c865a 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -416,7 +416,7 @@ module ActionController #:nodoc: end def read(name, options = nil) #:nodoc: - IO.read(real_file_path(name)) rescue nil + File.open(real_file_path(name), 'rb') { |f| f.read } rescue nil end def delete(name, options) #:nodoc: |