Added send_file method to the HttpResponse, culling parts from the DirHandler. Added support for the X-SENDFILE header to the Camping bridge.

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

1 files changed, 1 insertions, 22 deletions

diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb
index 6496d90..f9ad95f 100644
--- a/lib/mongrel/handlers.rb
+++ b/lib/mongrel/handlers.rb
@@ -1,12 +1,3 @@
-require 'rubygems'
-begin
-  require 'sendfile'
-  $mongrel_has_sendfile = true
-  STDERR.puts "** You have sendfile installed, will use that to serve files."
-rescue Object
-  $mongrel_has_sendfile = false
-end
-
 module Mongrel
 
   # You implement your application handler with this.  It's very light giving
@@ -188,22 +179,10 @@ module Mongrel
       response.send_header
 
       if not header_only
-        begin
-          if $mongrel_has_sendfile
-            File.open(req, "rb") { |f| response.socket.sendfile(f) }
-          else
-            File.open(req, "rb") { |f| response.socket.write(f.read) }
-          end
-        rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF
-          # ignore these since it means the client closed off early
-          STDERR.puts "Client closed socket requesting file #{req}: #$!"
-        end
-      else
-        response.send_body # should send nothing
+        response.send_file(req)
       end
     end
 
-
     # Process the request to either serve a file or a directory listing
     # if allowed (based on the listing_allowed paramter to the constructor).
     def process(request, response)