2 files changed, 8 insertions, 5 deletions
diff --git a/lib/rainbows/fiber/body.rb b/lib/rainbows/fiber/body.rb
index ab5cfc8..c6c4484 100644
--- a/lib/rainbows/fiber/body.rb
+++ b/lib/rainbows/fiber/body.rb
@@ -12,15 +12,17 @@ module Rainbows::Fiber::Body # :nodoc:
  
    # the sendfile 1.0.0+ gem includes IO#sendfile_nonblock
    if ::IO.method_defined?(:sendfile_nonblock)
-    def write_body_file(client, body)
-      sock, off = client.to_io, 0
+    def write_body_file(client, body, range)
+      sock, n = client.to_io, nil
+      offset, count = range ? range : [ 0, body.stat.size ]
        begin
-        off += sock.sendfile_nonblock(body, off, 0x10000)
+        offset += (n = sock.sendfile_nonblock(body, offset, count))
        rescue Errno::EAGAIN
          client.wait_writable
+        retry
        rescue EOFError
          break
-      end while true
+      end while (count -= n) > 0
      end
    else
      ALIASES[:write_body] = :write_body_each
diff --git a/lib/rainbows/fiber/rev.rb b/lib/rainbows/fiber/rev.rb
index 5bf4fdd..d837c01 100644
--- a/lib/rainbows/fiber/rev.rb
+++ b/lib/rainbows/fiber/rev.rb
@@ -100,6 +100,7 @@ module Rainbows::Fiber
  
            if hp.headers?
              headers = HH.new(headers)
+            range = parse_range(env, status, headers) and status = range.shift
              headers[CONNECTION] = if hp.keepalive? && G.alive
                KEEP_ALIVE
              else
@@ -108,7 +109,7 @@ module Rainbows::Fiber
              end
              client.write(response_header(status, headers))
            end
-          write_body(client, body)
+          write_body(client, body, range)
          end while env && env.clear && hp.reset.nil?
        rescue => e
          Error.write(io, e)