cvs: pear(MAINT_1_3_4) /Net_FTP generate_package_xml.php /Net_FTP/Net FTP.php

jschippers		Tue Apr 22 21:02:09 2008 UTC

  Modified files:              (Branch: MAINT_1_3_4)
    /pear/Net_FTP	generate_package_xml.php 
    /pear/Net_FTP/Net	FTP.php 
  Log:
  Fixed Bug #13114: Error check in $FTP->getRecursive(...)
  
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/generate_package_xml.php?r1=1.15.2.4&r2=1.15.2.5&diff_format=u
Index: pear/Net_FTP/generate_package_xml.php
diff -u pear/Net_FTP/generate_package_xml.php:1.15.2.4 pear/Net_FTP/generate_package_xml.php:1.15.2.5
--- pear/Net_FTP/generate_package_xml.php:1.15.2.4	Tue Apr 22 20:51:18 2008
+++ pear/Net_FTP/generate_package_xml.php	Tue Apr 22 21:02:09 2008
@@ -28,7 +28,8 @@
 '* Fixed Bug #13496: set bit not supported
 * Fixed Bug #13689: . in file owner or group name breaks _ls_match
 * Fixed Bug #13690: getRecursive does not work because of \'.\' and \'..\' '.
-'directories';
+'directories
+* Fixed Bug #13114: Error check in $FTP->getRecursive(...)';
 
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'dumpError');
 
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/Net/FTP.php?r1=1.53.2.7&r2=1.53.2.8&diff_format=u
Index: pear/Net_FTP/Net/FTP.php
diff -u pear/Net_FTP/Net/FTP.php:1.53.2.7 pear/Net_FTP/Net/FTP.php:1.53.2.8
--- pear/Net_FTP/Net/FTP.php:1.53.2.7	Tue Apr 22 20:51:18 2008
+++ pear/Net_FTP/Net/FTP.php	Tue Apr 22 21:02:09 2008
@@ -20,7 +20,7 @@
  * @author    Jorrit Schippers <[email protected]>
  * @copyright 1997-2008 The PHP Group
  * @license   http://www.php.net/license/3_0.txt PHP License 3.0
- * @version   CVS: $Id: FTP.php,v 1.53.2.7 2008/04/22 20:51:18 jschippers Exp $
+ * @version   CVS: $Id: FTP.php,v 1.53.2.8 2008/04/22 21:02:09 jschippers Exp $
  * @link      http://pear.php.net/package/Net_FTP
  * @since     File available since Release 0.0.1
  */
@@ -1430,6 +1430,9 @@
         }
         $dir_list = array();
         $dir_list = $this->ls($remote_path, NET_FTP_DIRS_ONLY);
+        if (PEAR::isError($dir_list)) {
+            return $dir_list;
+        }
         foreach ($dir_list as $dir_entry) {
             if ($dir_entry['name'] != '.' && $dir_entry['name'] != '..') {
                 $remote_path_new = $remote_path.$dir_entry["name"]."/";
@@ -1443,6 +1446,9 @@
         }
         $file_list = array();
         $file_list = $this->ls($remote_path, NET_FTP_FILES_ONLY);
+        if (PEAR::isError($file_list)) {
+            return $file_list;
+        }
         foreach ($file_list as $file_entry) {
             $remote_file = $remote_path.$file_entry["name"];
             $local_file  = $local_path.$file_entry["name"];