diff options
| author | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
| commit | 5514baf63d6d5e19a84c59a0c2cf74f442daed9c (patch) | |
| tree | ecde263c340d9fdbcf0f3ba9d9276e38f7fbfb96 /actionpack/lib/action_controller | |
| parent | 0780563ae7b2df74613550f1438d13459cb10b1f (diff) | |
| parent | 5be53058775a1482c1e5655dcb0ca4430cf0dbe1 (diff) | |
| download | rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.gz rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.bz2 rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0c0d0ec4ac..3322a41299 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -277,9 +277,10 @@ module ActionController #:nodoc: @@debug_routes = true cattr_accessor :debug_routes - # Controls whether the application is thread-safe, so multi-threaded servers like WEBrick know whether to apply a mutex - # around the performance of each action. Action Pack and Active Record are by default thread-safe, but many applications - # may not be. Turned off by default. + # Indicates to Mongrel or Webrick whether to allow concurrent action + # processing. Your controller actions and any other code they call must + # also behave well when called from concurrent threads. Turned off by + # default. @@allow_concurrency = false cattr_accessor :allow_concurrency |