shyouhei	2009-11-24 16:11:41 +0900 (Tue, 24 Nov 2009)

  New Revision: 25900

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25900

  Log:
    merge revision(s) 25311:
    * lib/net/ftp.rb (getaddress): rescue exceptions.  [ruby-dev:39451]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/net/ftp.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 25899)
+++ ruby_1_8_7/ChangeLog	(revision 25900)
@@ -1,3 +1,7 @@
+Tue Nov 24 16:09:41 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (getaddress): rescue exceptions.  [ruby-dev:39451]
+
 Tue Nov 24 15:51:07 2009  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* ext/curses/curses.c: Many functions of module Curses could cause a
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 25899)
+++ ruby_1_8_7/version.h	(revision 25900)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091124
-#define RUBY_PATCHLEVEL 217
+#define RUBY_PATCHLEVEL 218
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/ftp.rb
===================================================================
--- ruby_1_8_7/lib/net/ftp.rb	(revision 25899)
+++ ruby_1_8_7/lib/net/ftp.rb	(revision 25900)
@@ -346,9 +346,9 @@
     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"]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/