Backport Eric's changes to the http parser from trunk (Eric Wong).

Apply fix for Ragel 6 (Eric Wong, Ry Dahl).

Two tests fail with the new parser (1 failed with the old parser). Needs investigation.

Close #12 (mongrel_rails send_signal leaves a filehandle open until gc).
Close #14 (mongrel_rails command line option --num-procs does not change the max number of procs).
Close #15 (mongrel squashes helpful exception in register method).
Close #16, XXX needs audit! (CGIWrapper "options" attr_reader has no corresponding @options variable).
Close #20 (Mongrel doesn't erase temporary files during it's operation on windows).
Close #19, XXX needs audit! (HttpResponse#reset does not properly reset HeaderOut).
Close #22 (gem_plugin should load gems from Gem.path not Gem.dir).
Close #23 (mongrel_cluster's mongrel_rails configuration option isn't fully respected).

If I had git, being offline wouldn't have resulted in one massive commit.



git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/branches/stable_1-2@995 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 2 insertions, 1 deletions

diff --git a/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb b/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
index a82c424..312ef5c 100644
--- a/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
+++ b/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
@@ -7,7 +7,7 @@ Capistrano::Configuration.instance.load do
   set :mongrel_user, nil
   set :mongrel_group, nil
   set :mongrel_prefix, nil
-  set :mongrel_rails, 'mongrel_rails'
+  set :mongrel_rails, "mongrel_rails"
   set :mongrel_clean, false
   set :mongrel_pid_file, nil
   set :mongrel_log_file, nil
@@ -37,6 +37,7 @@ Capistrano::Configuration.instance.load do
         argv << "--group #{mongrel_group}" if mongrel_group
         argv << "--prefix #{mongrel_prefix}" if mongrel_prefix
         argv << "-S #{mongrel_config_script}" if mongrel_config_script
+        argv << "--mongrel_rails #{mongrel_rails}" if mongrel_rails         
         cmd = argv.join " "
         send(run_method, cmd)
       end