diff options
Diffstat (limited to 'lib/webrick')
| -rw-r--r-- | lib/webrick/httpauth/htdigest.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpauth/htpasswd.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/server.rb | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb index 1ef4fdb4aa..1b42c02dfa 100644 --- a/lib/webrick/httpauth/htdigest.rb +++ b/lib/webrick/httpauth/htdigest.rb @@ -79,7 +79,7 @@ module WEBrick File::rename(tmp.path, output) renamed = true ensure - tmp.close if !tmp.closed? + tmp.close File.unlink(tmp.path) if !renamed end end diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb index f43fc2c548..8c7b09463b 100644 --- a/lib/webrick/httpauth/htpasswd.rb +++ b/lib/webrick/httpauth/htpasswd.rb @@ -84,7 +84,7 @@ module WEBrick File::rename(tmp.path, output) renamed = true ensure - tmp.close if !tmp.closed? + tmp.close File.unlink(tmp.path) if !renamed end end diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 45bd9706d3..0a8e722b44 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 |