From 12985338067c9e8e7744c84c88f0b327835bcafa Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 24 Nov 2009 07:11:41 +0000
Subject: merge revision(s) 25311: 	* lib/net/ftp.rb (getaddress): rescue
 exceptions.  [ruby-dev:39451]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/ftp.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index e07418e83e..369aba893c 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -346,9 +346,9 @@ module Net
     private :transfercmd
     
     def getaddress
-      thishost = Socket.gethostname
+      thishost = Socket.gethostname rescue ""
       if not thishost.index(".")
-	thishost = Socket.gethostbyname(thishost)[0]
+        thishost = Socket.gethostbyname(thishost)[0] rescue ""
       end
       if ENV.has_key?("LOGNAME")
 	realuser = ENV["LOGNAME"]
-- 
cgit v1.2.3