Adjust code for compiling without SSL

lib/puma/binder.rb

@@ -5,7 +5,6 @@
 
 require 'puma/const'
 require 'puma/util'
-require 'puma/minissl/context_builder'
 require 'puma/configuration'
 
 module Puma
@@ -14,6 +13,8 @@ class Binder
 
     RACK_VERSION = [1,6].freeze
 
+    @@minissl_loaded = false
+
     def initialize(events, conf = Configuration.new)
       @events = events
       @listeners = []
@@ -155,6 +156,9 @@ def parse(binds, logger, log_msg = 'Listening')
 
           @listeners << [str, io]
         when "ssl"
+
+          load_ssl unless @@minissl_loaded
+
           params = Util.parse_query uri.query
           ctx = MiniSSL::ContextBuilder.new(params, @events).context
 
@@ -245,9 +249,8 @@ def inherit_tcp_listener(host, port, fd)
 
     def add_ssl_listener(host, port, ctx,
                          optimize_for_latency=true, backlog=1024)
-      require 'puma/minissl'
 
-      MiniSSL.check
+      load_ssl unless @@minissl_loaded
 
       if host == "localhost"
         loopback_addresses.each do |addr|
@@ -264,7 +267,6 @@ def add_ssl_listener(host, port, ctx,
       s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
       s.listen backlog
 
-
       ssl = MiniSSL::Server.new s, ctx
       env = @proto_env.dup
       env[HTTPS_KEY] = HTTPS
@@ -276,7 +278,6 @@ def add_ssl_listener(host, port, ctx,
 
     def inherit_ssl_listener(fd, ctx)
       require 'puma/minissl'
-      MiniSSL.check
 
       if fd.kind_of? TCPServer
         s = fd
@@ -384,5 +385,13 @@ def loopback_addresses
     def socket_activation_fd(int)
       int + 3 # 3 is the magic number you add to follow the SA protocol
     end
+
+    def load_ssl
+      @@minissl_loaded = true
+      require 'puma/minissl/context_builder'
+      require 'puma/accept_nonblock'
+      require 'puma/minissl'
+      MiniSSL.check
+    end
   end
 end

lib/puma/client.rb

@@ -9,6 +9,7 @@ module WaitReadable
 end
 
 require 'puma/detect'
+require 'puma/puma_http11'
 require 'tempfile'
 require 'forwardable'
 

lib/puma/minissl.rb

@@ -10,7 +10,6 @@
 
 module Puma
   module MiniSSL
-
     # define constant at runtime, as it's easy to determine at built time,
     # but Puma could (it shouldn't) be loaded with an older OpenSSL version
     HAS_TLS1_3 = !IS_JRUBY &&
@@ -308,5 +307,5 @@ def close
         @socket.close unless @socket.closed?       # closed? call is for Windows
       end
     end
-  end
+  end if IS_JRUBY || (Puma::MiniSSL.check.nil? rescue nil)
 end

lib/puma/minissl/context_builder.rb

@@ -2,9 +2,6 @@ module Puma
   module MiniSSL
     class ContextBuilder
       def initialize(params, events)
-        require 'puma/minissl'
-        MiniSSL.check
-
         @params = params
         @events = events
       end

lib/puma/reactor.rb

@@ -3,6 +3,8 @@
 require 'puma/util'
 require 'puma/minissl'
 
+# nio4r v2.5.2 uses OpenSSL, but doesn't load it.  Fixed in next release
+require 'openssl' if Puma::IS_WINDOWS
 require 'nio'
 
 module Puma

lib/puma/server.rb

@@ -8,13 +8,9 @@
 require 'puma/null_io'
 require 'puma/reactor'
 require 'puma/client'
-require 'puma/binder'
-require 'puma/accept_nonblock'
 require 'puma/util'
 require 'puma/io_buffer'
 
-require 'puma/puma_http11'
-
 require 'socket'
 require 'forwardable'