puma 3.8.1-java → 3.8.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0357a20d6102ee61afdf3fd696d6efe324a58df8
-  data.tar.gz: 07c84a9b4498b382719aadef24206f78995adbcb
+  metadata.gz: 91719dbea8ca6efae2e28fd0e1b1ea277e3bd9a2
+  data.tar.gz: 8dea9d3913293bda4c2e466ba1139bda10e0e4b7
 SHA512:
-  metadata.gz: e0d90d267c67bf674dde267c70c41bed3f1c6a0d334b70cb1ce990131622c882a43c0213a6c267e17013aedddf1348107a97e889f4583f2b3fb08f58f4d5804f
-  data.tar.gz: d955a443fce0be8d576f7e5ad6038e875594dab0f8e780aa6842c7f3e1827113c3071628a72e620f0eb08efcbc65fe16065eb64a498031a2cc4f4ad64a2b550a
+  metadata.gz: 3dd382f9c20d221bf8b1fa9278aca6538c4ede1d284d23390706f913229a0f2f401da63ad82c3110519dc8f946919e06ac04b73da25d84f50420370f7e185d21
+  data.tar.gz: 73f2c6615370e2466012d166af27231e5689c84decee4629401a0e45e2a0e75a1bcc7b1ca2d30d6054401c810f5cdb327a940da63b4d2b0ca917705b3f652605

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
   name: hoe
   prerelease: false
   type: :development
@@ -71,11 +71,8 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
-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
-  you use a  Ruby implementation with real threads like Rubinius or JRuby.
+        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 you use a  Ruby implementation with real threads like Rubinius or JRuby.
 email:
 - evan@phx.io
 executables:
@@ -200,6 +197,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
-summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
-  Ruby/Rack applications
+summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications
 test_files: []