diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:29:55 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-11 00:29:55 +0000 |
| commit | 0d1e3846d6831adfc4d47f117bc0bca1259d9db4 (patch) | |
| tree | fc4396313a5704b6f335fdad76ad17a0bf42a0f3 | |
| parent | 98c16a3320c8f018b6c30a54f61743c540c517f4 (diff) | |
| download | rails-0d1e3846d6831adfc4d47f117bc0bca1259d9db4.tar.gz rails-0d1e3846d6831adfc4d47f117bc0bca1259d9db4.tar.bz2 rails-0d1e3846d6831adfc4d47f117bc0bca1259d9db4.zip | |
Fixed that MemCacheStore wasn't included by default and added default MemCache object pointing to localhost #447 [Lucas Carlson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@384 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/session/mem_cache_store.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 701531fa95..85ac99a12b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that MemCacheStore wasn't included by default and added default MemCache object pointing to localhost #447 [Lucas Carlson] + * Added fourth argument to render_collection_of_partials that allows you to specify local_assigns -- just like render_partial #432 [zenspider] * Fixed that host would choke when cgi.host returned nil #432 [Tobias Luetke] diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index eda8fd651b..d597647f58 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -2,6 +2,7 @@ require 'action_controller/cgi_ext/cgi_ext' require 'action_controller/cgi_ext/cookie_performance_fix' require 'action_controller/session/drb_store' require 'action_controller/session/active_record_store' +require 'action_controller/session/mem_cache_store' module ActionController #:nodoc: class Base diff --git a/actionpack/lib/action_controller/session/mem_cache_store.rb b/actionpack/lib/action_controller/session/mem_cache_store.rb index 5dc8f3bfef..1073b408cc 100644 --- a/actionpack/lib/action_controller/session/mem_cache_store.rb +++ b/actionpack/lib/action_controller/session/mem_cache_store.rb @@ -46,7 +46,7 @@ begin unless check_id(id) raise ArgumentError, "session_id '%s' is invalid" % id end - @cache = options['cache'] + @cache = options['cache'] || MemCache.new('localhost') @session_key = "session:#{id}" @hash = {} end |