r22142@crimson: knu | 2009-02-08 22:27:31 +0900

 (:ftp_active_mode) new option. (r13307)
 (URI::FTP.buffer_open) turn ftp passive mode on if
 :ftp_active_mode => false is given.


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

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 2f3e5ce8ac..3995e305a1 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -98,6 +98,7 @@ module OpenURI
     :read_timeout => true,
     :ssl_ca_cert => nil,
     :ssl_verify_mode => nil,
+    :ftp_active_mode => true,
   }
 
   def OpenURI.check_options(options) # :nodoc:
@@ -596,6 +597,15 @@ module OpenURI
     # OpenURI::OpenRead#open returns an IO like object if block is not given.
     # Otherwise it yields the IO object and return the value of the block.
     # The IO object is extended with OpenURI::Meta.
+    #
+    # [:ftp_active_mode]
+    #  Synopsis:
+    #    :ftp_active_mode=>bool
+    #
+    # :ftp_active_mode=>false is used to make ftp passive mode.
+    # Note that the active mode is default in Ruby 1.8 or prior.
+    # Ruby 1.9 uses passive mode by default.
+    #
     def open(*rest, &block)
       OpenURI.open_uri(self, *rest, &block)
     end
@@ -732,6 +742,7 @@ module URI
 
       # The access sequence is defined by RFC 1738
       ftp = Net::FTP.open(self.host)
+      ftp.passive = true if !options[:ftp_active_mode]
       # todo: extract user/passwd from .netrc.
       user = 'anonymous'
       passwd = nil