* lib/webrick/server.rb (WEBrick::GenericServer#start):

  partially revert r35315.

* test/webrick/test_server.rb (test_start_exception):
  received signal is delivered to the main thread, so it is needed to
  emulate it. patched by Eric Hodel. [ruby-core:44348] [Feature #6236]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index bd9dcb0d1c..2eabf5d55c 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -133,12 +133,12 @@ module WEBrick
             rescue Errno::EBADF, IOError => ex
               # if the listening socket was closed in GenericServer#shutdown,
               # IO::select raise it.
-            rescue Interrupt => ex # ^C
-              @logger.fatal ex
-              raise
-            rescue Exception => ex
+            rescue StandardError => ex
               msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
               @logger.error msg
+            rescue Exception => ex
+              @logger.fatal ex
+              raise
             end
           end