You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/07/16 03:46:05 UTC

svn commit: r794486 - in /httpd/mod_ftp/trunk: CHANGES-FTP modules/ftp/ftp_commands.c

Author: wrowe
Date: Thu Jul 16 01:46:04 2009
New Revision: 794486

URL: http://svn.apache.org/viewvc?rev=794486&view=rev
Log:
Recognize TYPE A N (as (N)on-Print is the default, this is identical
to TYPE A).

Modified:
    httpd/mod_ftp/trunk/CHANGES-FTP
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

Modified: httpd/mod_ftp/trunk/CHANGES-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/CHANGES-FTP?rev=794486&r1=794485&r2=794486&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/CHANGES-FTP (original)
+++ httpd/mod_ftp/trunk/CHANGES-FTP Thu Jul 16 01:46:04 2009
@@ -2,7 +2,8 @@
 
   *) Accept lowercase TYPE arguments.  [William Rowe]
 
-  *) Implement MODE S, STRU F and TYPE L 8 (treated as I).  [William Rowe]
+  *) Implement MODE S, STRU F and TYPE L 8 (treated as I) and TYPE A N
+     (treated as TYPE A).  [William Rowe]
 
   *) Introduce FTPOptions NoUTF8Feature; without this configured in the
      global context, mod_ftp will report UTF8 in response to FEAT, to

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=794486&r1=794485&r2=794486&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu Jul 16 01:46:04 2009
@@ -2772,6 +2772,14 @@
             fc->response_notes = apr_pstrdup(r->pool, "Type set to I.");
             return FTP_REPLY_COMMAND_OK;
         }
+    } else if (!strcasecmp(arg, "A N")) {
+        /*
+         * Accept Ascii Non-Print
+         */
+        fc->type = TYPE_A;
+        fc->response_notes = apr_pstrdup(r->pool, "Type set to A N.");
+        return FTP_REPLY_COMMAND_OK;
+    }
     } else if (!strcasecmp(arg, "L 8")) {
         /*
          * Treat Local 8 as indistinguishible from Image for httpd platforms
@@ -3069,7 +3077,7 @@
 
     ftp_hook_cmd("TYPE", ftp_cmd_type, FTP_HOOK_LAST,
                  FTP_NEED_LOGIN | FTP_TAKE1,
-                 "<sp> [ A | E | I | L ]");
+                 "<sp> [ A [ fmt ] | E [ fmt ] | I | L size ]");
 
     ftp_hook_cmd("USER", ftp_cmd_user, FTP_HOOK_LAST,
                  FTP_TAKE1,