diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/server.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 0d697b763d..05884d43cd 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,6 @@ *SVN* -* Mongrel: script/server tails the rails log like it does with lighttpd. #5541 [mike@clarkware.com] +* Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 [mike@clarkware.com] * Don't assume Active Record is available. #5497 [bob@sporkmonger.com] diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index c61a4388d5..94208f7575 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -17,10 +17,10 @@ server = case ARGV.first when "lighttpd", "mongrel", "webrick" ARGV.shift else - if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) - "lighttpd" - elsif defined?(Mongrel) + if defined?(Mongrel) "mongrel" + elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) + "lighttpd" else "webrick" end |