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/05/29 01:03:40 UTC
svn commit: r779792 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c
ftp_connection.c ftp_data_connection.c ftp_data_filters.c ftp_filters.c
ftp_inet_pton.c ftp_limitlogin.c ftp_log.c ftp_message.c ftp_protocol.c
ftp_request.c ftp_util.c mod_ftp.c
Author: wrowe
Date: Thu May 28 23:03:40 2009
New Revision: 779792
URL: http://svn.apache.org/viewvc?rev=779792&view=rev
Log:
Clean up internal includes, FTP_BUILD is not required any longer
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.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=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_version.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_portable.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c Thu May 28 23:03:40 2009
@@ -36,7 +36,6 @@
* SOFTWARE.
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_network_io.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_log.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_log.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_log.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_message.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_message.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_message.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_request.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_request.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_request.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_util.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Thu May 28 23:03:40 2009
@@ -20,7 +20,6 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_fnmatch.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=779792&r1=779791&r2=779792&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Thu May 28 23:03:40 2009
@@ -20,13 +20,11 @@
* FTP Protocol module for Apache 2.0
*/
-#define FTP_BUILD
#include "mod_ftp.h"
#include "ftp_internal.h"
#define FTP_SERVER_STRING "mod_ftp/" MODFTP_VERSION
-
static ap_filter_rec_t *ftp_crlf_filter_handle;
static ap_filter_rec_t *ftp_data_out_filter_handle;
static ap_filter_rec_t *ftp_byterange_filter_handle;
@@ -36,8 +34,7 @@
ap_filter_rec_t *ftp_ssl_output_filter_handle;
/* Register callbacks for mod_log_config. */
-static int ftp_pre_config(apr_pool_t *p, apr_pool_t *plog,
- apr_pool_t *ptemp)
+static int ftp_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
{
APR_OPTIONAL_FN_TYPE(ap_register_log_handler) * log_pfn_register;
@@ -871,7 +868,7 @@
"Set the allowed PASV port range"),
AP_INIT_FLAG("FTPEPSVIgnoreFamily", ftp_epsv_ignore_family,
NULL, RSRC_CONF, \
- "Instructs EPSV handler to ignore the requested IPv4 or IPv6"
+ "Instructs EPSV handler to ignore the requested IPv4 or IPv6"
" address family (to accomodate network translation)"),
AP_INIT_TAKE1("FTPBannerMessage", ftp_set_banner_message, NULL, RSRC_CONF,
"Set initial login message"),