6 files changed, 6 insertions, 8 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index f3fa1fd54d..1cf23a8b92 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -12,7 +12,6 @@ else
 end
 
 require 'rubygems' if ARGV.include?("--dev")
-
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 66dbb5d11e..32e361d421 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -23,7 +23,8 @@ module Rails
         opt.parse!(ARGV)
       end
 
-      @app.load_console(options[:sandbox])
+      @app.sandbox = options[:sandbox]
+      @app.load_console
 
       if options[:debugger]
         begin
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 2a84e2a6df..ae354eca97 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,8 +1,6 @@
 require 'rails/generators'
 require 'active_support/core_ext/object/inclusion'
 
-Rails::Generators.configure!
-
 if ARGV.first.in?([nil, "-h", "--help"])
   Rails::Generators.help 'destroy'
   exit
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 28c1c56352..b6f9a003d1 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -1,8 +1,6 @@
 require 'rails/generators'
 require 'active_support/core_ext/object/inclusion'
 
-Rails::Generators.configure!
-
 if ARGV.first.in?([nil, "-h", "--help"])
   Rails::Generators.help 'generate'
   exit
diff --git a/railties/lib/rails/commands/plugin_new.rb b/railties/lib/rails/commands/plugin_new.rb
index 8baa8ebfd4..0287ba0638 100644
--- a/railties/lib/rails/commands/plugin_new.rb
+++ b/railties/lib/rails/commands/plugin_new.rb
@@ -1,3 +1,5 @@
+require 'rubygems' if ARGV.include?("--dev")
+
 if ARGV.first != "new"
   ARGV[0] = "--help"
 else
@@ -6,5 +8,4 @@ end
 
 require 'rails/generators'
 require 'rails/generators/rails/plugin_new/plugin_new_generator'
-
-Rails::Generators::PluginNewGenerator.start
+Rails::Generators::PluginNewGenerator.start
+\ No newline at end of file
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 505a4ca2bd..91c87514cf 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,6 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rails::Rack::ContentLength]
       Hash.new(middlewares)
     end