spider-gazelle 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeeb2298300d8da4d2f42c72ae863890bdaf4bd1
-  data.tar.gz: 57f36f06c105a1d4a0f1159e84f314d7643bfc66
+  metadata.gz: 04d19c0615315a23b7d35692bf0164d1942cf060
+  data.tar.gz: 1bc208a4be3b5e27b5fa67e30327219dfcb08dde
 SHA512:
-  metadata.gz: 0e74529dcefd976af63a9ba055d0cfef12af3d12cd80aeee35bd8f7622aaf90169202e30d9753459d10231e8ca0f543351241242ffd6ddad3bf94cdfd63d27ff
-  data.tar.gz: 173ec327155daba986d1a4d594bb0c75872a99b69f080f510d90c8d5370543dd5f93f824afd88374412cb2cfab48c12c981c89a7a3545e1f40cee9f53256d8d8
+  metadata.gz: b4c895af6b1163f38befb2168a7462ac7a4244912e3b4b1fe1c401aecfe3443464ce3cbf9ab84503d2b48149ab8458d54ab8a002d5a45ccad276485dbcbc7b56
+  data.tar.gz: de884e14291e07b7e5076af6f7aaa6a51074f1050858c88caf5d43f33bbe8d2b1bf01baf5a558e65d2ca4405636c55eb9c94ec6df41f16a397e9a105bab21cd1

data/lib/rack/lock_patch.rb

@@ -8,6 +8,7 @@ module Rack
   # will effectively be executed synchronously.
   class Lock
     # FLAG = 'rack.multithread'.freeze # defined in rack/lock
+    RACK_MULTITHREAD ||= FLAG
 
     def initialize(app, mutex = Mutex.new)
       @app, @mutex = app, mutex
@@ -16,20 +17,16 @@ module Rack
     end
 
     def call(env)
-      old, env[FLAG] = env[FLAG], false
       @mutex.lock
       @count += 1
       @sig.wait(@mutex) if @count > 1
-      response = @app.call(env)
-      body = BodyProxy.new(response[2]) {
+      response = @app.call(env.merge(RACK_MULTITHREAD => false))
+      returned = response << BodyProxy.new(response.pop) {
         @mutex.synchronize { unlock }
       }
-      response[2] = body
-      response
     ensure
-      unlock unless body
+      unlock unless returned
       @mutex.unlock
-      env[FLAG] = old
     end
 
     private

data/lib/spider-gazelle/connection.rb

@@ -1,4 +1,5 @@
 require 'spider-gazelle/const'
+require 'digest/md5'
 require 'stringio'
 
 module SpiderGazelle
@@ -182,30 +183,51 @@ module SpiderGazelle
 
           # If a file, stream the body in a non-blocking fashion
           if body.respond_to? :to_path
-            if headers[CONTENT_LENGTH2]
-              type = :raw
-            else
-              type = :http
-              headers[TRANSFER_ENCODING] = CHUNKED
-            end
-
-            write_headers status, headers
+            file = @loop.file body.to_path, File::RDONLY
 
             # Send the body in parallel without blocking the next request in dev
             # Also if this is a head request we still want the body closed
             body.close if body.respond_to?(:close)
 
-            if send_body
-              file = @loop.file body.to_path, File::RDONLY
-              file.progress do
-                # File is open and available for reading
-                file.send_file(@socket, type).finally do
+            file.progress do
+              statprom = file.stat
+              statprom.then do |stats|
+                headers[ETAG] = ::Digest::MD5.hexdigest "#{stats[:st_mtim][:tv_sec]}#{body.to_path}"
+
+                if headers[CONTENT_LENGTH2]
+                  type = :raw
+                else
+                  type = :http
+                  headers[TRANSFER_ENCODING] = CHUNKED
+                end
+
+                write_headers status, headers
+
+                if send_body
+                  # File is open and available for reading
+                  file.send_file(@socket, type).finally do
+                    file.close
+                    @socket.shutdown if @request.keep_alive == false
+                  end
+                else
                   file.close
                   @socket.shutdown if @request.keep_alive == false
                 end
               end
-              return file
+
+              # Ensure the file is closed if there is an error
+              statprom.catch do |reason|
+                file.close
+                @loop.work do
+                  msg = "connection error: #{reason.message}\n#{reason.backtrace.join("\n") if reason.backtrace}\n"
+                  @gazelle.logger.error msg
+                end
+
+                send_response [500, {}, EMPTY_RESPONSE]
+              end
             end
+
+            return file
           else
             # Optimize the response
             begin

data/lib/spider-gazelle/const.rb

@@ -27,7 +27,7 @@ module SpiderGazelle
   # REMOTE_USER, or REMOTE_HOST parameters since those are either a security problem or
   # too taxing on performance.
   module Const
-    SPIDER_GAZELLE_VERSION = VERSION = "1.0.5".freeze
+    SPIDER_GAZELLE_VERSION = VERSION = "1.0.6".freeze
     # CODE_NAME = "Earl of Sandwich Partition"
     SERVER = "SpiderGazelle".freeze
 
@@ -93,7 +93,7 @@ module SpiderGazelle
     DEFAULT_TYPE = "text/plain".freeze
 
     # LAST_MODIFIED = "Last-Modified".freeze
-    # ETAG = "ETag".freeze
+    ETAG = "ETag".freeze
     # SLASH = "/".freeze
     REQUEST_METHOD = "REQUEST_METHOD".freeze
     # GET = "GET".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake