fast_send 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea16771c56f207d5c40555b4981d955e20724177
-  data.tar.gz: 691ef28f1a505a95c974c5060fc66eff6147ad22
+  metadata.gz: 26069db40cb9f389a16d39c87a6171dd6f341256
+  data.tar.gz: 937f14723306d0d7dcdd58b8a1178a895bcbcbdd
 SHA512:
-  metadata.gz: a354a9e5b09f1d598147428351f824f39b42c1b29e48633ee334791bc68d3c95edc2bc551f2eb7087c8e29f37b20c9ff33360528f7424422e0de403575cda916
-  data.tar.gz: eae00df9f9beb28595c2de2023915245525a27892ed67e2b6ee192446e24822b9f80929051ad6f1bf1a8bb2ede2529bf3ae6364758db3166097ff8466d9ac7e3
+  metadata.gz: 325587ad50e76b729cc2075b31800d0da68410004bc5826fa936a86ae2fa68da66bfc44511167070bea6a201524d73bd63f7ca84f66e94781ef1a30b21a30cdb
+  data.tar.gz: 25d732c665b5ad6fc96b7a822cdf28225d30e55fec78b0124b61468ec59ccd8f45bef02bc3b6d9c8c7bd6b71e645193019fd98b18d8e12ab66c3f3a91db54d94

data/.travis.yml

@@ -0,0 +1,15 @@
+rvm:
+- 2.3.3
+- 2.5.0
+
+before_install:
+  - gem update --system # Due to: https://github.com/travis-ci/travis-ci/issues/8978
+
+cache: bundler
+
+# Travis permits the following phases: before_install, install, after_install, before_script, script, after_script
+# before_install:
+#   - gem update bundler # Travis RVM ships with an old-ish Bundler which has no install_if support
+
+script:
+  - bundle exec rspec --backtrace

data/fast_send.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-11-15"
+  s.date = Time.now.utc.strftime("%Y-%m-%d")
   s.description = "Send bursts of large files quickly via Rack"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

data/lib/fast_send/socket_handler.rb

@@ -1,3 +1,5 @@
+require 'io/wait'
+
 # Handles the TCP socket within the Rack hijack. Is used instead of a Proc object for better
 # testability and better deallocation
 class FastSend::SocketHandler < Struct.new(:stream, :logger, :started_proc, :aborted_proc, :error_proc, 
@@ -84,18 +86,17 @@ class FastSend::SocketHandler < Struct.new(:stream, :logger, :started_proc, :abo
   #
   # Note that this will not work on OSX due to a sendfile() bug.
   def fire_timeout_using_select(writable_socket)
-    at = Time.now
+    started_polling_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    select_timeout_secs = 0.25
+    sleep_after_select_timeout_secs = 0.5
     loop do
-      _, writeables, errored = IO.select(nil, [writable_socket], [writable_socket], SELECT_TIMEOUT_ON_BLOCK)
-      if writeables && writeables.include?(writable_socket) 
-        return # We can proceed
-      end
-      if errored && errored.include?(writable_socket)
-        raise SlowLoris, "Receiving socket had an error, connection will be dropped"
-      end
-      if (Time.now - at) > SOCKET_TIMEOUT
+      socket_or_nil = writable_socket.wait_writable(SELECT_TIMEOUT_ON_BLOCK)
+      return if socket_or_nil # socket became writable
+      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      if (now - started_polling_at) > SOCKET_TIMEOUT
         raise SlowLoris, "Receiving socket timed out on sendfile(), probably a dead slow loris"
       end
+      sleep(sleep_after_select_timeout_secs)
     end
   end
 

data/lib/fast_send/version.rb

@@ -1,3 +1,3 @@
 class FastSend
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_send
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md