Implemented Request #14773: setPassive possible before connecting

git-svn-id: http://svn.php.net/repository/pear/packages/Net_FTP/trunk@267353 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Oct 15, 2008 · 22221e5 · 22221e5
1 parent 3735e8a
commit 22221e5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 1.4.0a3 - 2008-??-??
 * Fixed Bug #13946: Test Failed : testPutRecursive
 * Fixed Bug #14513: Timestamp when using the LS function
+* Implemented Request #14773: setPassive possible before connecting
 
 1.4.0a2 - 2008-05-19
 * Fixed Bug #13496: set bit not supported
@@ -119,4 +120,4 @@ Fix for FatalError on Line 834 (rmrecursive()).
 Unknown
 
 0.5 2002-12-20
-First release
+First release
diff --git a/Net/FTP.php b/Net/FTP.php
@@ -750,6 +750,9 @@ function connect($host = null, $port = null)
                                      NET_FTP_ERR_CONNECT_FAILED);
         } else {
             $this->_handle =& $handle;
+            if ($this->_passv) {
+                $this->setPassive();
+            }
             return true;
         }
     }
@@ -1764,7 +1767,9 @@ function setMode($mode)
     function setPassive()
     {
         $this->_passv = true;
-        @ftp_pasv($this->_handle, true);
+        if ($this->_handle != null) {
+            @ftp_pasv($this->_handle, true);
+        }
     }
 
     /**
@@ -1776,7 +1781,9 @@ function setPassive()
     function setActive()
     {
         $this->_passv = false;
-        @ftp_pasv($this->_handle, false);
+        if ($this->_handle != null) {
+            @ftp_pasv($this->_handle, false);
+        }
     }
 
     /**

diff --git a/generate_package_xml.php b/generate_package_xml.php
@@ -55,7 +55,8 @@ function dumpError($err)
 
 $current_notes =
 '* Fixed Bug #13946: Test Failed : testPutRecursive
-* Fixed Bug #14513: Timestamp when using the LS function';
+* Fixed Bug #14513: Timestamp when using the LS function
+* Implemented Request #14773: setPassive possible before connecting';
 
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'dumpError');
 

diff --git a/package.xml b/package.xml
@@ -23,8 +23,8 @@ for example the view of a progress bar.</description>
   <email>toby@php.net</email>
   <active>no</active>
  </lead>
- <date>2008-09-13</date>
- <time>21:27:40</time>
+ <date>2008-10-15</date>
+ <time>17:06:31</time>
  <version>
   <release>1.4.0a3</release>
   <api>1.4.0</api>
@@ -35,7 +35,8 @@ for example the view of a progress bar.</description>
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>* Fixed Bug #13946: Test Failed : testPutRecursive
-* Fixed Bug #14513: Timestamp when using the LS function</notes>
+* Fixed Bug #14513: Timestamp when using the LS function
+* Implemented Request #14773: setPassive possible before connecting</notes>
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="example">
@@ -241,10 +242,11 @@ for example the view of a progress bar.</description>
     <release>alpha</release>
     <api>stable</api>
    </stability>
-   <date>2008-09-13</date>
+   <date>2008-10-15</date>
    <license uri="http://www.php.net/license">PHP License</license>
    <notes>* Fixed Bug #13946: Test Failed : testPutRecursive
-* Fixed Bug #14513: Timestamp when using the LS function</notes>
+* Fixed Bug #14513: Timestamp when using the LS function
+* Implemented Request #14773: setPassive possible before connecting</notes>
   </release>
  </changelog>
 </package>