lib/slinky/server.rb in slinky-0.1.1 vs lib/slinky/server.rb in slinky-0.2.0

@@ -101,26 +101,19 @@
     def serve_file path
       if File.exists?(path) && size = File.size?(path)
         _, _, extension = path.match(EXTENSION_REGEX).to_a
         @resp.content_type CONTENT_TYPES[extension]
         # File reading code from rack/file.rb
-        range = 0..size-1
-        EM.defer do
-          File.open path do |file|
-            file.seek(range.begin)
-            remaining_len = range.end-range.begin+1
-            while remaining_len > 0
-              
-              part = file.read([8192, remaining_len].min)
-              break unless part
-              remaining_len -= part.length
-
-              @resp.chunk part
-              @resp.send_chunks
-            end
+        File.open path do |file|
+          @resp.content = ""
+          while size > 0
+            part = file.read([8192, size].min)
+            break unless part
+            size -= part.length
+            @resp.content << part
           end
-          @resp.send_trailer
         end
+        @resp.send_response
       else
         @resp.status = 404
         @resp.content = "File '#{path}' not found."
         @resp.send_response
       end