You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rw...@apache.org on 2008/03/08 20:49:56 UTC
svn commit: r635059 - in
/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp:
FTPClientConfig.java parser/DefaultFTPFileEntryParserFactory.java
Author: rwinston
Date: Sat Mar 8 11:49:53 2008
New Revision: 635059
URL: http://svn.apache.org/viewvc?rev=635059&view=rev
Log:
Add a fix for UNKNOWN Type: L8 SYST messages (NET-169)
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?rev=635059&r1=635058&r2=635059&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java Sat Mar 8 11:49:53 2008
@@ -179,6 +179,14 @@
public static final String SYST_MVS = "MVS";
/**
+ * Some servers return an "UNKNOWN Type: L8" message
+ * in response to the SYST command. We set these to be a Unix-type system.
+ * This may happen if the ftpd in question was compiled without system
+ * information.
+ */
+ public static final String SYST_L8 = "Type: L8";
+
+ /**
* Identifier by which an Netware-based ftp server is known throughout
* the commons-net ftp system.
*/
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=635059&r1=635058&r2=635059&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java Sat Mar 8 11:49:53 2008
@@ -97,7 +97,8 @@
{
ukey = key.toUpperCase();
}
- if (ukey.indexOf(FTPClientConfig.SYST_UNIX) >= 0)
+ if ((ukey.indexOf(FTPClientConfig.SYST_UNIX) >= 0)
+ || (ukey.indexOf(FTPClientConfig.SYST_L8) >= 0))
{
parser = createUnixFTPEntryParser();
}