aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-01 16:42:48 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-01 16:42:48 +0000
commit8ec208b3fb86e2e461ce3417257b03a2758c09e6 (patch)
tree984b4e5f0c66eefd6ae4acc3586b7f21892a0497
parent7fcbf1d86203fadeed9fac5635695bf3feeb0490 (diff)
downloadruby-8ec208b3fb86e2e461ce3417257b03a2758c09e6.tar.gz
* lib/ping.rb (Ping.pingecho): should rescue StandardError.
[ruby-dev:26677] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/ping.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ff3cdf948..1762f4d474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 2 01:40:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/ping.rb (Ping.pingecho): should rescue StandardError.
+ [ruby-dev:26677]
+
Mon Aug 1 19:02:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/tcltklib.c: refactoring - replaced rb_ivar_defined &
diff --git a/lib/ping.rb b/lib/ping.rb
index 7f970f96de..07b46374b2 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -49,7 +49,7 @@ module Ping
end
rescue Errno::ECONNREFUSED
return true
- rescue Timeout::Error
+ rescue Timeout::Error, StandardError
return false
end
return true