remote_file: CHEF-1031: FTP URLs; CHEF-3786: authenticated HTTP/S

Conflicts:

	lib/chef/provider/remote_file.rb
	lib/chef/resource/remote_file.rb

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb
index 2798cba3f2..21e1a2680f 100644
--- a/lib/chef/resource/remote_file.rb
+++ b/lib/chef/resource/remote_file.rb
@@ -33,6 +33,7 @@ class Chef
         @resource_name = :remote_file
         @action = "create"
         @source = nil
+        @ftp_active_mode = false
         @provider = Chef::Provider::RemoteFile
       end
 
@@ -54,6 +55,14 @@ class Chef
         )
       end
 
+      def ftp_active_mode(args=nil)
+        set_or_return(
+          :ftp_active_mode,
+          args,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
       def after_created
         validate_source(@source)
       end