uninterruptible 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45204189743c30326bd6e496b3c69c88d4383d5
-  data.tar.gz: c8d14b020356d5f68685b2f58833a433868cddb2
+  metadata.gz: dc6895a8d950201b505824cb01a5b5822e760993
+  data.tar.gz: 16dcbfd142547b5aaa2fcb2e743eb574fbeb0f92
 SHA512:
-  metadata.gz: c89bd5e1d9adadc4b3e31bf9b745f339599d158782d9eb6bd81d1e47c58f0f58d00469cb72566b2730baaf80222b6887acdf0dcdebf6c89c669a4e74624ed126
-  data.tar.gz: d78b97f691ed20d40f02730f6e3fcf866e1fb27218b3256187c4aec046819fe7279a0aaed86ba8088dbe0e8fc57b5463c4c7ef7617299fb581fd51de6e04f087
+  metadata.gz: b4b6ef5ac65cc75a40a8fbc589b986c52f61a9fc340cd347a855dc2754e35659e02ca01a43db42eee7de63d21fac6dabb9653ef543fcc7502f3e274b0cb81439
+  data.tar.gz: 74f5a5afac38b36906987fc19d55a966354cde588d85a341af6d9e3454606c3691981953b43f567dc968107d70ebeb93939eb1fad94236a442eb732ab4c264df

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.3
+* Accept new connections with #accept instead of #accept_nonblock
+* Remove SSLExtensions module as this is no longer required
+
 ## 2.5.2
 * Pass a class to UNIXSocket.recv_io to have the C-code instantiate our socket server. If we don't, they have a habit of getting garbage collected resulting in Errno:EBADF exceptions
 

data/lib/uninterruptible/server.rb

@@ -110,7 +110,7 @@ module Uninterruptible
     # loop for example. By default this creates one thread per connection. Override this method to provide a new
     # concurrency model.
     def accept_client_connection
-      Thread.start(socket_server.accept_nonblock) do |client_socket|
+      Thread.start(socket_server.accept) do |client_socket|
         process_request(client_socket)
       end
     rescue OpenSSL::SSL::SSLError => e

data/lib/uninterruptible/version.rb

@@ -1,3 +1,3 @@
 module Uninterruptible
-  VERSION = "2.5.2".freeze
+  VERSION = "2.5.3".freeze
 end

data/lib/uninterruptible.rb

@@ -2,7 +2,6 @@ require 'openssl'
 require 'ipaddr'
 
 require "uninterruptible/version"
-require 'uninterruptible/ssl_extensions'
 require 'uninterruptible/configuration'
 require 'uninterruptible/binder'
 require 'uninterruptible/file_descriptor_server'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uninterruptible
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Dan Wentworth
@@ -78,7 +78,6 @@ files:
 - lib/uninterruptible/file_descriptor_server.rb
 - lib/uninterruptible/network_restrictions.rb
 - lib/uninterruptible/server.rb
-- lib/uninterruptible/ssl_extensions.rb
 - lib/uninterruptible/tls_server_factory.rb
 - lib/uninterruptible/version.rb
 - uninterruptible.gemspec

data/lib/uninterruptible/ssl_extensions.rb

@@ -1,30 +0,0 @@
-# Augment some parts of OpenSSL::SSL::SSLServer from stdlib for extra functionality
-module OpenSSL
-  module SSL
-    # Extend this module from stdlib to delegate additional methods to the underlying TCP transport when wrapping
-    # with an OpenSSL::SSL::SSLServer
-    module SocketForwarder
-      # Fetch the file descriptor ID from the underlying transport
-      def to_i
-        to_io.to_i
-      end
-    end
-
-    # Extend OpenSSL::SSL::SSLServer to implement accept_nonblock (only #accept is implemented by stdlib)
-    class SSLServer
-      def accept_nonblock
-        sock = @svr.accept_nonblock
-
-        begin
-          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-          ssl.sync_close = true
-          ssl.accept if @start_immediately
-          ssl
-        rescue SSLError
-          sock.close
-          raise
-        end
-      end
-    end
-  end
-end