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, 28 insertions, 0 deletions

diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 830aba1..228fd9f 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -9,6 +9,15 @@ require 'mongrel/tcphack'
 require 'yaml'
 require 'time'
 
+begin
+  require 'rubygems' 
+  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
+
 # Mongrel module containing all of the classes (include C extensions) for running
 # a Mongrel web server.  It contains a minimalist HTTP server with just enough
 # functionality to service web application requests fast as possible.
@@ -324,6 +333,25 @@ module Mongrel
       end
     end 
 
+    # Appends the contents of +path+ to the response stream.  The file is opened for binary
+    # reading and written in chunks to the socket.  If the 
+    # <a href="http://rubyforge.org/projects/ruby-sendfile">sendfile</a> library is found,
+    # it is used to send the file, often with greater speed and less memory/cpu usage.
+    def send_file(path)
+      File.open(path, "rb") do |f|
+        if @socket.respond_to? :sendfile
+          @socket.sendfile(f)
+        else
+          while chunk = f.read(Const::CHUNK_SIZE)
+            @socket.write(chunk)
+          end
+        end
+          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
+
     def write(data)
       @socket.write(data)
     end