puma 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b092d06bbb74d2735cfd3f481f563c5125bcd5
-  data.tar.gz: 57b467e1eb4eb262a8b558bb57e32d0b2a1a4f30
+  metadata.gz: 7b623ac72b5bea3525cc1c76bd48385e0eef0a17
+  data.tar.gz: d5a2ec55bef9deb959e22faa6c077e7b323a7834
 SHA512:
-  metadata.gz: b71754de00668f9be0df78f69c08c306d6920715203fd3c9ffd60f01fb43d132aa4658607c71123756370dcebad5f07a957ba0f455c81073d3ea275de44c2463
-  data.tar.gz: ffb7c6abf49bc3842038c7ca393931070e86411d5023b17deea9ce1f35080facd973ae48eebbbf6d636a1556f27977f91aea0938f87b432ff9e5fe1e67163c3e
+  metadata.gz: 33c903e1d88e6552d8146a9fd1a829f8c6e8f15d131ec37854d29025952186a9cafda9204b89d12682f3905973bb8c6c0606948587e34b36b62d24c16ad5572b
+  data.tar.gz: d4137246420030c7e1deb7988c7cf15f20b8543211d6c1ef6fae240092941aeeae60c53353d81d8aa7b62064410119f4e4a80d8427b16a5d6c98d4a6fe51b495

data/History.md

@@ -1,18 +1,23 @@
+## 3.8.2 / 2017-03-14
+
+* 1 bugfix:
+  * Deal with getsockopt with TCP\_INFO failing for sockets that say they're TCP but aren't really. (#1241)
+
 ## 3.8.1 / 2017-03-10
 
-* bugfixes:
+* 1 bugfix:
   * Remove method call to method that no longer exists (#1239)
 
 ## 3.8.0 / 2017-03-09
 
-* bugfixes:
+* 2 bugfixes:
   * Port from rack handler does not take precedence over config file in Rails 5.1.0.beta2+ and 5.0.1.rc3+ (#1234)
   * The `tmp/restart.txt` plugin no longer restricts the user from running more than one server from the same folder at a time (#1226)
 
-* features:
+* 1 feature:
   * Closed clients are aborted to save capacity (#1227)
 
-* Refactors
+* 1 refactor:
   * Bundler is no longer a dependency from tests (#1213)
 
 ## 3.7.1 / 2017-02-20
@@ -36,7 +41,7 @@
   * Minor refactor on Thread pool (#1088)
   * Removed a ton of unused constants, variables and files.
   * Use MRI macros when allocating heap memory
-  * Use hooks for on_booted event. (#1160)
+  * Use hooks for on\_booted event. (#1160)
 
 * 14 bugfixes:
   * Add eof? method to NullIO? (#1169)

data/lib/puma/const.rb

@@ -95,7 +95,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.8.1".freeze
+    PUMA_VERSION = VERSION = "3.8.2".freeze
     CODE_NAME = "Sassy Salamander".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
 

data/lib/puma/server.rb

@@ -78,6 +78,8 @@ module Puma
       ENV['RACK_ENV'] ||= "development"
 
       @mode = :http
+
+      @precheck_closing = true
     end
 
     attr_accessor :binder, :leak_stack_on_error
@@ -121,10 +123,18 @@ module Puma
 
       def closed_socket?(socket)
         return false unless socket.kind_of? TCPSocket
-        tcp_info = socket.getsockopt(Socket::SOL_TCP, Socket::TCP_INFO)
-        state = tcp_info.unpack(UNPACK_TCP_STATE_FROM_TCP_INFO)[0]
-        # TIME_WAIT: 6, CLOSE: 7, CLOSE_WAIT: 8, LAST_ACK: 9, CLOSING: 11
-        (state >= 6 && state <= 9) || state == 11
+        return false unless @precheck_closing
+
+        begin
+          tcp_info = socket.getsockopt(Socket::SOL_TCP, Socket::TCP_INFO)
+        rescue IOError, SystemCallError
+          @precheck_closing = false
+          false
+        else
+          state = tcp_info.unpack(UNPACK_TCP_STATE_FROM_TCP_INFO)[0]
+          # TIME_WAIT: 6, CLOSE: 7, CLOSE_WAIT: 8, LAST_ACK: 9, CLOSING: 11
+          (state >= 6 && state <= 9) || state == 11
+        end
       end
     else
       def cork_socket(socket)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
   for Ruby/Rack applications. Puma is intended for use in both development and production
   environments. In order to get the best throughput, it is highly recommended that
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for