aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-07-10 16:09:09 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-07-10 16:09:51 -0700
commitcc60b5e3596d7763fa1c48fa12fee8dbba9a1a17 (patch)
tree2bfbb81f3181bedd66d6071e9342850b8743c33b /railties
parent57ab74cdb1304b6baf79d37886d08551e065b5d6 (diff)
downloadrails-cc60b5e3596d7763fa1c48fa12fee8dbba9a1a17.tar.gz
rails-cc60b5e3596d7763fa1c48fa12fee8dbba9a1a17.tar.bz2
rails-cc60b5e3596d7763fa1c48fa12fee8dbba9a1a17.zip
remove Rack::Lock for webrick
constant loading should be thread safe now, so lets remove this
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/server.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 6289d4cc46..d1e445ac70 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -77,17 +77,7 @@ module Rails
end
def middleware
- middlewares = []
-
- # FIXME: add Rack::Lock in the case people are using webrick.
- # This is to remain backwards compatible for those who are
- # running webrick in production. We should consider removing this
- # in development.
- if server.name == 'Rack::Handler::WEBrick'
- middlewares << [::Rack::Lock]
- end
-
- Hash.new(middlewares)
+ Hash.new([])
end
def default_options