aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/rack_ext/lock.rb
diff options
context:
space:
mode:
authorAhmed El-Daly <aeldaly@developergurus.com>2009-01-21 22:18:10 -0500
committerAhmed El-Daly <aeldaly@developergurus.com>2009-01-21 22:18:10 -0500
commitf08a78a057782577d5efbc82662d7898e26dcb8c (patch)
treed0638cf1d180ed3713ecafcf36ea1df9bc5eeb7a /actionpack/lib/action_controller/rack_ext/lock.rb
parentc5069bd4951419ea02aea35ac5c121bc0c311940 (diff)
parente8f7da6118936af2d145b3c025db4b4dcd0b3308 (diff)
downloadrails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.gz
rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.bz2
rails-f08a78a057782577d5efbc82662d7898e26dcb8c.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/rack_ext/lock.rb')
-rw-r--r--actionpack/lib/action_controller/rack_ext/lock.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/rack_ext/lock.rb b/actionpack/lib/action_controller/rack_ext/lock.rb
new file mode 100644
index 0000000000..9bf1889065
--- /dev/null
+++ b/actionpack/lib/action_controller/rack_ext/lock.rb
@@ -0,0 +1,21 @@
+module Rack
+ # Rack::Lock was commited to Rack core
+ # http://github.com/rack/rack/commit/7409b0c
+ # Remove this when Rack 1.0 is released
+ unless defined? Lock
+ class Lock
+ FLAG = 'rack.multithread'.freeze
+
+ def initialize(app, lock = Mutex.new)
+ @app, @lock = app, lock
+ end
+
+ def call(env)
+ old, env[FLAG] = env[FLAG], false
+ @lock.synchronize { @app.call(env) }
+ ensure
+ env[FLAG] = old
+ end
+ end
+ end
+end