Restore windows compatibility

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,8 +1,6 @@
 *SVN*
 
-* Use custom mime file for script/server mongrel if config/mime.yml exists.  Pass --mime=other/path for a custom mime file.  [Rick Olson]
-
-* Add custom mime type file for mongrel.  config/mime.yml is added with generated apps from the rails command.  [Rick Olson]
+* Made script/server work with -e and -d when using Mongrel [DHH]
 
 * Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs]
 

railties/lib/commands/servers/mongrel.rb

@@ -45,7 +45,11 @@ else
   trap(:INT) { exit }
 
   begin
-    `mongrel_rails start -p #{OPTIONS[:port]} -a #{OPTIONS[:ip]} -e #{OPTIONS[:environment]}`
+    silence_warnings do
+      ARGV = [ "start", "-p", OPTIONS[:port].to_s, "-a", OPTIONS[:ip].to_s, "-e", OPTIONS[:environment] ]
+    end
+
+    load("mongrel_rails")
   ensure
     tail_thread.kill if tail_thread
     puts 'Exiting'