diff options
Diffstat (limited to 'lib/mongrel')
-rw-r--r-- | lib/mongrel/handlers.rb | 4 | ||||
-rw-r--r-- | lib/mongrel/rails.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb index b308194..6bc2a70 100644 --- a/lib/mongrel/handlers.rb +++ b/lib/mongrel/handlers.rb @@ -169,7 +169,7 @@ module Mongrel ext = req[dot_at .. -1] if MIME_TYPES[ext] stat = File.stat(req) - response.header[Const::CONTENT_TYPE] = MIME_TYPES[ext] + response.header[Const::CONTENT_TYPE] = MIME_TYPES[ext] || "text" # TODO: Confirm this works for rfc 1123 response.header[Const::LAST_MODIFIED] = HttpServer.httpdate(stat.mtime) # TODO that this is a valid way to calculate an etag @@ -187,7 +187,7 @@ module Mongrel else File.open(req, "rb") { |f| response.socket.write(f.read) } end - rescue EOFError,Errno::ECONNRESET,Errno::EPIPE + rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL # ignore these since it means the client closed off early end else diff --git a/lib/mongrel/rails.rb b/lib/mongrel/rails.rb index 66db691..611fcd0 100644 --- a/lib/mongrel/rails.rb +++ b/lib/mongrel/rails.rb @@ -132,7 +132,8 @@ module Mongrel $orig_dollar_quote = $".clone ENV['RAILS_ENV'] = ops[:environment] - require "#{ops[:cwd]}/config/environment" + env_location = "#{ops[:cwd]}/config/environment" + require env_location require 'dispatcher' require 'mongrel/rails' |