diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 23:05:41 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 23:05:41 +0000 |
commit | f845a9ef76c0195254ded79c85c24332534f4057 (patch) | |
tree | 015ae2e6909fd287ac1b3b18e0675196e181fb0d /lib/webrick/httpauth | |
parent | 8e4c8e96429e939f6b527919b276f6cd97380ebc (diff) | |
download | ruby-f845a9ef76c0195254ded79c85c24332534f4057.tar.gz |
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/httpauth')
-rw-r--r-- | lib/webrick/httpauth/htdigest.rb | 2 | ||||
-rw-r--r-- | lib/webrick/httpauth/htpasswd.rb | 2 |
2 files changed, 2 insertions, 2 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 |