Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

script/server prefers mongrel over lighttpd

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 141962348c74239874d85990ba0d9c3d5d73d9c6 1 parent 0a072e8
Jeremy Kemper jeremy authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  railties/CHANGELOG
  2. +3 −3 railties/lib/commands/server.rb
2  railties/CHANGELOG
View
@@ -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]
6 railties/lib/commands/server.rb
View
@@ -17,10 +17,10 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.