diff options
| author | Pan Thomakos <pan.thomakos@gmail.com> | 2011-03-11 17:57:28 -0800 |
|---|---|---|
| committer | Pan Thomakos <pan.thomakos@gmail.com> | 2011-03-11 17:57:28 -0800 |
| commit | 72759f58674138a89f68a1184bfc2df8327d9d0d (patch) | |
| tree | a3d35b70e7d725d9dfef21c8adb0ef83f075af36 /activesupport/lib/active_support/cache/mem_cache_store.rb | |
| parent | 53794cf7b5a9f66c3173f4ca9a5ee3279965a3a0 (diff) | |
| download | rails-72759f58674138a89f68a1184bfc2df8327d9d0d.tar.gz rails-72759f58674138a89f68a1184bfc2df8327d9d0d.tar.bz2 rails-72759f58674138a89f68a1184bfc2df8327d9d0d.zip | |
Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.
Diffstat (limited to 'activesupport/lib/active_support/cache/mem_cache_store.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index 45263d482f..a4b20719cd 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -158,7 +158,10 @@ module ActiveSupport private def escape_key(key) - key = key.to_s.gsub(ESCAPE_KEY_CHARS){|match| "%#{match.getbyte(0).to_s(16).upcase}"} + # Fix for EncodedKeyCacheBehavior failing tests in caching_test.rb. + key = key.to_s.dup + key = key.force_encoding(ESCAPE_KEY_CHARS.encoding) if key.respond_to?(:encoding) && key.encoding != ESCAPE_KEY_CHARS.encoding + key = key.gsub(ESCAPE_KEY_CHARS){|match| "%#{match.getbyte(0).to_s(16).upcase}"} key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250 key end |