cvs: pear(MAINT_1_3_4) /Net_FTP generate_package_xml.php /Net_FTP/Net FTP.php
[email protected] ("Jorrit Schippers")
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvsjschippers1208896879@cvsserver> |
jschippers Tue Apr 22 20:41:19 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 #13689: . in file owner or group name breaks _ls_match
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/generate_package_xml.php?r1=1.15.2.2&r2=1.15.2.3&diff_format=u
Index: pear/Net_FTP/generate_package_xml.php
diff -u pear/Net_FTP/generate_package_xml.php:1.15.2.2 pear/Net_FTP/generate_package_xml.php:1.15.2.3
--- pear/Net_FTP/generate_package_xml.php:1.15.2.2 Tue Apr 22 20:03:50 2008
+++ pear/Net_FTP/generate_package_xml.php Tue Apr 22 20:41:19 2008
@@ -25,7 +25,8 @@
for example the view of a progress bar.';
$current_notes =
-'* Fixed Bug #13496: set bit not supported';
+'* Fixed Bug #13496: set bit not supported
+* Fixed Bug #13689: . in file owner or group name breaks _ls_match';
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'dumpError');
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/Net/FTP.php?r1=1.53.2.5&r2=1.53.2.6&diff_format=u
Index: pear/Net_FTP/Net/FTP.php
diff -u pear/Net_FTP/Net/FTP.php:1.53.2.5 pear/Net_FTP/Net/FTP.php:1.53.2.6
--- pear/Net_FTP/Net/FTP.php:1.53.2.5 Tue Apr 22 20:33:18 2008
+++ pear/Net_FTP/Net/FTP.php Tue Apr 22 20:41:19 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.5 2008/04/22 20:33:18 jschippers Exp $
+ * @version CVS: $Id: FTP.php,v 1.53.2.6 2008/04/22 20:41:19 jschippers Exp $
* @link http://pear.php.net/package/Net_FTP
* @since File available since Release 0.0.1
*/
@@ -632,8 +632,8 @@
$this->_ls_match = array(
'unix' => array(
- 'pattern' => '/(?:(d)|.)([rwxts-]{9})\s+(\w+)\s+([\w\d-()?]+)\s+'.
- '([\w\d-()?]+)\s+(\w+)\s+(\S+\s+\S+\s+\S+)\s+(.+)/',
+ 'pattern' => '/(?:(d)|.)([rwxts-]{9})\s+(\w+)\s+([\w\d-()?.]+)\s+'.
+ '([\w\d-()?.]+)\s+(\w+)\s+(\S+\s+\S+\s+\S+)\s+(.+)/',
'map' => array(
'is_dir' => 1,
'rights' => 2,