Fixes bugs 4658, 4478, 4402, and minor fix for the katana killer concurrency change.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@227 19e92222-5c0b-0410-8929-a290d50e31e9

2 files changed, 23 insertions, 17 deletions

diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index 38ec96c..6eae4bc 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -57,10 +57,6 @@ class Start < GemPlugin::Plugin "/commands"
     valid_user? @user if @user
     valid_group? @group if @group
 
-    if ActionController::Base.allow_concurrency
-      STDERR.puts "[RAILS] allow_concurrency is true.  Wow, you're very brave."
-    end
-
     return @valid
   end
   
@@ -164,17 +160,19 @@ class Stop < GemPlugin::Plugin "/commands"
 
   def configure 
     options [ 
-      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
+      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
       ['-f', '--force', "Force the shutdown.", :@force, false],
       ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
     ]
   end
 
   def validate
-    @cwd = File.expand_path(@cwd)
-    valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+    if @cwd
+      @cwd = File.expand_path(@cwd)
+      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+      @pid_file = File.join(@cwd,@pid_file)
+    end
 
-    @pid_file = File.join(@cwd,@pid_file)
     valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
 
     return @valid
@@ -197,17 +195,19 @@ class Restart < GemPlugin::Plugin "/commands"
 
   def configure 
     options [ 
-      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
+      ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
       ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
       ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
     ]
   end
 
   def validate
-    @cwd = File.expand_path(@cwd)
-    valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+    if @cwd
+      @cwd = File.expand_path(@cwd)
+      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+      @pid_file = File.join(@cwd,@pid_file)
+    end
 
-    @pid_file = File.join(@cwd,@pid_file)
     valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
 
     return @valid
diff --git a/lib/mongrel/rails.rb b/lib/mongrel/rails.rb
index f108236..f3b9aef 100644
--- a/lib/mongrel/rails.rb
+++ b/lib/mongrel/rails.rb
@@ -44,6 +44,7 @@ module Mongrel
     class RailsHandler < Mongrel::HttpHandler
       attr_reader :files
       attr_reader :guard
+      @@file_only_methods = ["GET","HEAD"]
 
       def initialize(dir, mime_map = {})
         @files = Mongrel::DirHandler.new(dir,false)
@@ -64,11 +65,12 @@ module Mongrel
 
         path_info = request.params[Mongrel::Const::PATH_INFO]
         page_cached = path_info + ".html"
+        get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
 
-        if @files.can_serve(path_info)
+        if get_or_head and @files.can_serve(path_info)
           # File exists as-is so serve it up
           @files.process(request,response)
-        elsif @files.can_serve(page_cached)
+        elsif get_or_head and @files.can_serve(page_cached)
           # possible cached page, serve it up      
           request.params[Mongrel::Const::PATH_INFO] = page_cached
           @files.process(request,response)
@@ -77,8 +79,9 @@ module Mongrel
             cgi = Mongrel::CGIWrapper.new(request, response)
             cgi.handler = self
 
+            # ultra dangerous, but people are asking to kill themselves.  here's the Katana
             @guard.lock unless ActionController::Base.allow_concurrency
-            # Rails is not thread safe so must be run entirely within synchronize 
+
             Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body)
 
             # This finalizes the output using the proper HttpResponse way
@@ -89,7 +92,7 @@ module Mongrel
             STDERR.puts "Error calling Dispatcher.dispatch #{rails_error.inspect}"
             STDERR.puts rails_error.backtrace.join("\n")
           ensure
-            @guard.unlock
+            @guard.unlock unless ActionController::Base.allow_concurrency
           end
         end
       end
@@ -154,6 +157,9 @@ module Mongrel
         require 'dispatcher'
         require 'mongrel/rails'
 
+        if ActionController::Base.allow_concurrency
+          log "[RAILS] ActionController::Base.allow_concurrency is true.  Wow, you're very brave."
+        end
         @rails_handler = RailsHandler.new(ops[:docroot], ops[:mime])
       end
 
@@ -177,7 +183,7 @@ module Mongrel
       def setup_rails_signals(options={})
         ops = resolve_defaults(options)
         setup_signals(options)
-        
+
         if RUBY_PLATFORM !~ /mswin/
           # rails reload
           trap("HUP") { log "HUP signal received."; reload!          }