summaryrefslogtreecommitdiff
path: root/lib/webrick/server.rb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-21 23:05:41 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-21 23:05:41 +0000
commitf845a9ef76c0195254ded79c85c24332534f4057 (patch)
tree015ae2e6909fd287ac1b3b18e0675196e181fb0d /lib/webrick/server.rb
parent8e4c8e96429e939f6b527919b276f6cd97380ebc (diff)
lib/*: remove closed checks
Follow r56795. Since Ruby 2.2, calling #close on a closed socket no longer raises exceptions. * lib/cgi/session.rb (update): remove closed? check * lib/net/http.rb (finish, transport_request): ditto * lib/net/imap.rb (disconnect): ditto * lib/net/pop.rb (do_start, do_finish): ditto * lib/net/smtp.rb (do_start, do_finish): ditto * lib/open3.rb (popen_run, pipeline_run): ditto * lib/pstore.rb (transaction): ditto * lib/shell/process-controller.rb (sfork): * lib/tempfile (_close, call, Tempfile.create): ditto * lib/webrick/httpauth/htdigest.rb (flush): ditto * lib/webrick/httpauth/htpasswd.rb (flush): ditto * lib/webrick/server.rb (start_thread, cleanup_shutdown_pipe): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/server.rb')
-rw-r--r--lib/webrick/server.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 45bd970..0a8e722 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -309,7 +309,7 @@ module WEBrick
else
@logger.debug "close: <address unknown>"
end
- sock.close unless sock.closed?
+ sock.close
end
}
end
@@ -334,11 +334,9 @@ module WEBrick
@shutdown_pipe = nil
return if !shutdown_pipe
shutdown_pipe.each {|io|
- if !io.closed?
- begin
- io.close
- rescue IOError # another thread closed io.
- end
+ begin
+ io.close
+ rescue IOError # another thread closed io.
end
}
end