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 2007/10/03 19:33:32 UTC
svn commit: r581666 - in /httpd/mod_ftp/trunk: include/ftp_config.h
include/ftp_config.h.in modules/ftp/ftp_commands.c
Author: wrowe
Date: Wed Oct 3 10:33:31 2007
New Revision: 581666
URL: http://svn.apache.org/viewvc?rev=581666&view=rev
Log:
Glob's gone
Modified:
httpd/mod_ftp/trunk/include/ftp_config.h
httpd/mod_ftp/trunk/include/ftp_config.h.in
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
Modified: httpd/mod_ftp/trunk/include/ftp_config.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/ftp_config.h?rev=581666&r1=581665&r2=581666&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/ftp_config.h (original)
+++ httpd/mod_ftp/trunk/include/ftp_config.h Wed Oct 3 10:33:31 2007
@@ -8,6 +8,3 @@
/* Define to 1 if you have the `fchmod' function. */
#define HAVE_FCHMOD
-/* Define to 1 if we deploy the "glob" flavor. */
-#define FTP_HAS_GLOB
-
Modified: httpd/mod_ftp/trunk/include/ftp_config.h.in
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/ftp_config.h.in?rev=581666&r1=581665&r2=581666&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/ftp_config.h.in (original)
+++ httpd/mod_ftp/trunk/include/ftp_config.h.in Wed Oct 3 10:33:31 2007
@@ -6,6 +6,3 @@
/* Define to 1 if you have the `fchmod' function. */
#undef HAVE_FCHMOD
-/* Define to 1 if we deploy the "glob" flavor. */
-#undef FTP_HAS_GLOB
-
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=581666&r1=581665&r2=581666&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Wed Oct 3 10:33:31 2007
@@ -614,10 +614,6 @@
return ftp_cmd_nlst(r, argcopy);
}
-#ifndef FTP_HAS_GLOB
- /* There is no need to check for abuses of * when globbing is not
- * enabled. */
-#else
if (ap_strchr_c(arg, '*') != NULL) {
/* Prevent DOS attacks, only allow one segment to have a wildcard */
int found = 0; /* The number of segments with a wildcard */
@@ -647,7 +643,6 @@
return FTP_REPLY_FILE_NOT_FOUND;
}
}
-#endif /* FTP_HAS_GLOB */
if ((res = ftp_set_uri(r, arg))) {
return res;