merges r25510 from trunk into ruby_1_9_1.

--
* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
  a Pathname instance into a string.  [ruby-core:26237]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b74b6884a8..c192df9f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 27 15:44:48 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+	  a Pathname instance into a string.  [ruby-core:26237]
+
 Tue Oct 27 07:53:25 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (garbage_collect_with_gvl): do not garbage_collect when
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 4a7a6a72c9..468a242154 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -544,7 +544,7 @@ module Net
       end
       begin
 	f.binmode if localfile
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
+	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
 	  f.write(data) if localfile
 	  yield(data) if block_given?
           result.concat(data) if result
@@ -676,7 +676,7 @@ module Net
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg
+	cmd = cmd + " " + arg.to_s
       end
       if block
 	retrlines(cmd, &block)
diff --git a/version.h b/version.h
index 6ea951564b..160c160d62 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 414
+#define RUBY_PATCHLEVEL 415
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1