Fix deadlock on Ctrl+C in server mode

The INT/TERM trap handler called shutdown, which closed the TCP server
socket from the same thread blocked on accept, causing a
ThreadError (deadlock; recursive locking).

Replace the trap-based shutdown with rescue Interrupt around the
accept loop.  Move cleanup into an ensure block so it runs on any
exit path.

Author: st0012

lib/rdoc/rdoc.rb

@@ -546,10 +546,6 @@ def generate
 
   def start_server
     server = RDoc::Server.new(self, @options.server_port)
-
-    trap('INT')  { server.shutdown }
-    trap('TERM') { server.shutdown }
-
     server.start
   end
 

lib/rdoc/server.rb

@@ -91,15 +91,10 @@ def start
     loop do
       client = @tcp_server.accept
       Thread.new(client) { |c| handle_client(c) }
-    rescue IOError
-      break
     end
-  end
-
-  ##
-  # Shuts down the server.
-
-  def shutdown
+  rescue Interrupt
+    # Ctrl+C
+  ensure
     @running = false
     @tcp_server&.close
     @watcher_thread&.join(2)