aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/bin/lighttpd2
-rw-r--r--railties/configs/lighttpd.conf6
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/bin/lighttpd b/railties/bin/lighttpd
index 0820ff5903..3220b16925 100644
--- a/railties/bin/lighttpd
+++ b/railties/bin/lighttpd
@@ -2,7 +2,7 @@
if RUBY_PLATFORM !~ /mswin/ && `lighttpd -version 2>/dev/null`.size > 0
puts "=> Rails application started on http://0.0.0.0:3000"
- puts "=> Ctrl-C to shutdown server"
+ puts "=> Ctrl-C to shutdown server (see config/lighttpd.conf for options)"
`lighttpd -D -f #{File.dirname(__FILE__) + "/../"}/config/lighttpd.conf`
else
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf
index f9ab45263b..80a6703b37 100644
--- a/railties/configs/lighttpd.conf
+++ b/railties/configs/lighttpd.conf
@@ -12,11 +12,13 @@ accesslog.filename = "log/lighttpd.access.log"
url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+# Change *-procs to 2 if you need to use Upload Progress or other tasks that
+# *need* to execute a second request while the first is still pending.
fastcgi.server = ( ".fcgi" =>
( "localhost" =>
(
- "min-procs" => 2,
- "max-procs" => 2,
+ "min-procs" => 1,
+ "max-procs" => 1,
"socket" => "log/fcgi.socket",
"bin-path" => "public/dispatch.fcgi",
"bin-environment" => ( "RAILS_ENV" => "development" )