kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Handle mixed fd/Listener in inherit_ssl_listener as well

Browse source
This commit is contained in:
David Kellum 2016-04-01 11:09:48 -07:00
parent 3632856ad5
commit 13a5dac22b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/puma/binder.rb
View file

@ -288,7 +288,11 @@ module Puma
require 'puma/minissl'
MiniSSL.check
s = TCPServer.for_fd(fd)
if fd.kind_of? TCPServer
s = fd
else
s = TCPServer.for_fd(fd)
end
ssl = MiniSSL::Server.new(s, ctx)
env = @proto_env.dup