Drop ActionController::Base.allow_concurrency flag

1 files changed, 2 insertions, 11 deletions

diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index ad4ca926ba..2f60151b22 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -43,8 +43,6 @@ end
 # can change this behavior by setting ActionController::Base.allow_concurrency
 # to true.
 class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
-  REQUEST_MUTEX = Mutex.new
-
   # Start the WEBrick server with the given options, mounting the
   # DispatchServlet at <tt>/</tt>.
   def self.dispatch(options = {})
@@ -73,15 +71,8 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def service(req, res) #:nodoc:
     unless handle_file(req, res)
-      begin
-        REQUEST_MUTEX.lock unless ActionController::Base.allow_concurrency
-        unless handle_dispatch(req, res)
-          raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
-      ensure
-        unless ActionController::Base.allow_concurrency
-          REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-        end
+      unless handle_dispatch(req, res)
+        raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
       end
     end
   end