2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d38b63c7a9..b085238f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
+	  [ruby-dev:26677]
+
 Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tcltklib/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