2 files changed, 15 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index cc0552184a..c84fa832f5 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -26,7 +26,12 @@ module Rails
           'port'      => '--port',
           'socket'    => '--socket',
           'username'  => '--user',
-          'encoding'  => '--default-character-set'
+          'encoding'  => '--default-character-set',
+          'sslca'     => '--ssl-ca',
+          'sslcert'   => '--ssl-cert',
+          'sslcapath' => '--ssl-capath',
+          'sslcipher' => '--ssh-cipher',
+          'sslkey'    => '--ssl-key'
         }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
 
         if config['password'] && options['include_password']
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 9ef64da3ef..a684129353 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -87,6 +87,15 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
       middlewares << [::Rack::ContentLength]
+
+      # 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)
     end