aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-12-15 18:22:35 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-15 18:22:35 -0800
commit89056885b030b981193d73ebde56cf60829a924c (patch)
tree9d432f7226754115ac4d2ef8aa1134221ff294bb /actionpack/lib/action_controller/cgi_process.rb
parent19be3d35b38b6685789d8d343617d465a3652717 (diff)
parent43ac42c46a462e1453b1b97da00e11bff7bba55d (diff)
downloadrails-89056885b030b981193d73ebde56cf60829a924c.tar.gz
rails-89056885b030b981193d73ebde56cf60829a924c.tar.bz2
rails-89056885b030b981193d73ebde56cf60829a924c.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 5d6988e1b1..7e5e95e135 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -61,7 +61,7 @@ module ActionController #:nodoc:
class CgiRequest #:nodoc:
DEFAULT_SESSION_OPTIONS = {
- :database_manager => CGI::Session::CookieStore,
+ :database_manager => nil,
:prefix => "ruby_sess.",
:session_path => "/",
:session_key => "_session_id",