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 01:48:41 UTC

svn commit: r794464 - /httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

Author: wrowe
Date: Wed Jul 15 23:48:41 2009
New Revision: 794464

URL: http://svn.apache.org/viewvc?rev=794464&view=rev
Log:
Stop advertising commands that no longer exist in STD 9!!!

And add a forward pointer to where we do register the UTF8 feature.

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

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=794464&r1=794463&r2=794464&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Wed Jul 15 23:48:41 2009
@@ -3042,28 +3042,36 @@
                  FTP_TAKE1,
                  "<sp> username");
 
-    /* Old X-flavor CDUP */
+    /* RFC2640 offers UTF-8; it does not insist all octets are UTF-8,
+     * even for arbitrary file names.  This reflects 'most unix' today.
+     * Because we want to permit admins not to advertise support,
+     * this is handled in post-config; see mod_ftp.c.
+     */
+    /* ftp_feat_advert("UTF8"); */
+
+    /* Unadvertised, deprecated RFC775 X-flavor CDUP */
     ftp_hook_cmd_alias("XCUP", "CDUP", FTP_HOOK_LAST,
-                       FTP_NEED_LOGIN | FTP_TAKE0,
+                       FTP_NO_HELP | FTP_NEED_LOGIN | FTP_TAKE0,
                        "change to parent directory");
 
-    /* Old X-flavor CWD */
+    /* Unadvertised, deprecated RFC542 X-flavor CWD */
     ftp_hook_cmd_alias("XCWD", "CWD", FTP_HOOK_LAST,
-                       FTP_NEED_LOGIN | FTP_TAKE1,
+                       FTP_NO_HELP | FTP_NEED_LOGIN | FTP_TAKE1,
                        "[ <sp> directory-name ]");
 
-    /* Old X-flavor MKD */
+    /* Unadvertised, deprecated RFC775 X-flavor MKD */
     ftp_hook_cmd_alias("XMKD", "MKD", FTP_HOOK_LAST,
-                       FTP_NEED_LOGIN | FTP_TAKE1,
+                       FTP_NO_HELP | FTP_NEED_LOGIN | FTP_TAKE1,
                        "<sp> path-name");
 
-    /* Old X-flavor PWD */
+    /* Unadvertised, deprecated RFC775 X-flavor PWD */
     ftp_hook_cmd_alias("XPWD", "PWD", FTP_HOOK_LAST,
-                       FTP_NEED_LOGIN | FTP_TAKE0,
+                       FTP_NO_HELP | FTP_NEED_LOGIN | FTP_TAKE0,
                        "(return current directory)");
 
-    /* Old X-flavor RMD */
+    /* Unadvertised, deprecated RFC775 X-flavor RMD */
     ftp_hook_cmd_alias("XRMD", "RMD", FTP_HOOK_LAST,
-                       FTP_NEED_LOGIN | FTP_TAKE1,
+                       FTP_NO_HELP | FTP_NEED_LOGIN | FTP_TAKE1,
                        "<sp> path-name");
+
 }