diff options
| author | Sam Stephenson <sam@37signals.com> | 2005-11-07 15:35:03 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2005-11-07 15:35:03 +0000 |
| commit | aec5273f41af4f7c4cfa335b904b6fce6499bbda (patch) | |
| tree | d0c0c41f233bfc616c1cb699fe7bd94377c6de21 /railties | |
| parent | fa0a5973dbc306651c4d7bb90020b9a92506a8bf (diff) | |
| download | rails-aec5273f41af4f7c4cfa335b904b6fce6499bbda.tar.gz rails-aec5273f41af4f7c4cfa335b904b6fce6499bbda.tar.bz2 rails-aec5273f41af4f7c4cfa335b904b6fce6499bbda.zip | |
Use require_library_or_gem 'fcgi' in script/server
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2920 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/server.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 30e8eb9435..4fda0feaad 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson] + * Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' [DHH] * New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins']. [Jeremy Kemper] diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index ab22f2c565..310afba689 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -1,7 +1,7 @@ require 'active_support' begin - require 'fcgi' + require_library_or_gem 'fcgi' rescue Exception # FCGI not available end |