diff options
| author | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-02-19 15:03:32 +0000 |
|---|---|---|
| committer | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-02-19 15:03:32 +0000 |
| commit | a128709186acb486a329b2ee5ce7d87ce8af87d8 (patch) | |
| tree | 06cda345c5a364a300750bd2c7192e6db4bc98c4 | |
| parent | e22cae38e125b7240c3516b5476ff131d5ab1b54 (diff) | |
| download | unicorn-a128709186acb486a329b2ee5ce7d87ce8af87d8.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@46 19e92222-5c0b-0410-8929-a290d50e31e9
| -rw-r--r-- | bin/mongrel_rails | 1 | ||||
| -rw-r--r-- | lib/mongrel.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails index e9d4fa9..cb891e1 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -126,6 +126,7 @@ class StartCommand < Mongrel::Command::Command server.acceptor.join rescue Interrupt puts "Interrupted." + raise end end diff --git a/lib/mongrel.rb b/lib/mongrel.rb index 50827ef..05d7b71 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -623,10 +623,9 @@ module Mongrel # length -- Ignored since Mongrel figures this out from what you write to output. # def header(options = "text/html") - # if they pass in a string then just write the Content-Type if options.class == String - @head['Content-Type'] = options + @head['Content-Type'] = options unless @head['Content-Type'] else # convert the given options into what Mongrel wants @head['Content-Type'] = options['type'] || "text/html" |