1 files changed, 2 insertions, 1 deletions
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index dd4df4e129..efd8271a78 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -322,7 +322,8 @@ module DRb
     def accept # :nodoc:
       begin
       while true
-        soc = @socket.accept
+        soc = accept_or_shutdown
+        return nil unless soc
         break if (@acl ? @acl.allow_socket?(soc) : true)
         soc.close
       end