4 files changed, 7 insertions, 4 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 96229bb4f6..f6bdf129d6 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -94,8 +94,8 @@ module Rails
       require 'debugger'
       puts "=> Debugger enabled"
     rescue LoadError
-      puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
-      exit
+      puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
+      exit(1)
     end
   end
 end
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 5914c9e4ae..3e4cc787c4 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -44,7 +44,7 @@ module Rails
 
         find_cmd_and_exec(['mysql', 'mysql5'], *args)
 
-      when "postgresql", "postgres"
+      when "postgresql", "postgres", "postgis"
         ENV['PGUSER']     = config["username"] if config["username"]
         ENV['PGHOST']     = config["host"] if config["host"]
         ENV['PGPORT']     = config["port"].to_s if config["port"]
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index c4622d6a2d..2b77d5d387 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -48,7 +48,7 @@ if code_or_file.nil?
   exit 1
 elsif File.exist?(code_or_file)
   $0 = code_or_file
-  eval(File.read(code_or_file), nil, code_or_file)
+  Kernel.load code_or_file
 else
   eval(code_or_file)
 end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index e3119ecf22..87d6505ed5 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -63,6 +63,9 @@ module Rails
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
       puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
       puts "=> Run `rails server -h` for more startup options"
+      if options[:Host].to_s.match(/0\.0\.0\.0/)
+        puts "=> Notice: server is listening on all interfaces (#{options[:Host]}). Consider using 127.0.0.1 (--binding option)"
+      end
       trap(:INT) { exit }
       puts "=> Ctrl-C to shutdown server" unless options[:daemonize]