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 2014/10/21 14:04:01 UTC
svn commit: r1633354 - /httpd/mod_ftp/trunk/modules/ftp/
Author: wrowe
Date: Tue Oct 21 12:04:00 2014
New Revision: 1633354
URL: http://svn.apache.org/r1633354
Log:
Introduce 2.4 logging mechanics
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_lowportd.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
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Tue Oct 21 12:04:00 2014
@@ -26,9 +26,14 @@
#include <limits.h>
#endif
-/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+
+/* In httpd 2.4, we want to log by module */
+APLOG_USE_MODULE(ftp);
+
+/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#define remote_ip client_ip
+
#endif
/* Wish APR had one of these */
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Tue Oct 21 12:04:00 2014
@@ -17,6 +17,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/* Placeholder of "unknown" username (not valid for ftp_cmd_pass)
*/
const char ftp_unknown_username[] = "unknown";
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Tue Oct 21 12:04:00 2014
@@ -27,6 +27,9 @@
#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+/* In httpd 2.4, we want to log by module */
+APLOG_USE_MODULE(ftp);
+
/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#define remote_ip client_ip
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c Tue Oct 21 12:04:00 2014
@@ -17,6 +17,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/* Reimplement the core i/o filters to insert two-channel
* data socket buckets for send or retrieve, monitoring
* the control channel for sideband ABOR-like commands.
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c Tue Oct 21 12:04:00 2014
@@ -17,6 +17,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/* ftp_crlf_filter: Filter for sending ASCII files. RFC 959 states that
* CRLF should be use where necessary to denote the end
* of line. This filter replaces all LF's with CRLF's.
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c Tue Oct 21 12:04:00 2014
@@ -50,6 +50,11 @@
#include <errno.h>
#endif
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
#ifndef IN6ADDRSZ
#define IN6ADDRSZ 16
#endif
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Tue Oct 21 12:04:00 2014
@@ -23,9 +23,14 @@
#include "unixd.h"
#endif
-/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+
+/* In httpd 2.4, we want to log by module */
+APLOG_USE_MODULE(ftp);
+
+/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#define remote_ip client_ip
+
#endif
#define FTP_SERVER_LIMIT_KEY "FireballXL5OnDVD"
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_log.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_log.c Tue Oct 21 12:04:00 2014
@@ -17,6 +17,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/*
* callbacks for mod_log_config.
*
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c?rev=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c Tue Oct 21 12:04:00 2014
@@ -31,6 +31,11 @@
#include <sys/un.h> /* for sockaddr_un */
#endif
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
typedef struct lowportd_req_t {
pid_t ppid;
server_rec *server;
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_message.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_message.c Tue Oct 21 12:04:00 2014
@@ -17,10 +17,15 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
-/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+
+/* In httpd 2.4, we want to log by module */
+APLOG_USE_MODULE(ftp);
+
+/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#define remote_ip client_ip
#define remote_addr client_addr
+
#endif
/* ftp_message_generate: Function to transform meta-characters
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Tue Oct 21 12:04:00 2014
@@ -18,6 +18,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/* Min # of bytes to allocate when reading a request line */
#define MIN_LINE_ALLOC 512
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_request.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_request.c Tue Oct 21 12:04:00 2014
@@ -17,6 +17,11 @@
#include "mod_ftp.h"
#include "ftp_internal.h"
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
#ifndef apr_time_from_sec
#define apr_time_from_sec(sec) ((apr_time_t)(sec) * APR_USEC_PER_SEC)
#endif
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=1633354&r1=1633353&r2=1633354&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Tue Oct 21 12:04:00 2014
@@ -19,6 +19,11 @@
#include "apr_fnmatch.h"
#include "ap_mpm.h" /* For MPM query interface */
+/* In httpd 2.4, we want to log by module */
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+APLOG_USE_MODULE(ftp);
+#endif
+
/* Warning; the *arg is consumed, manipulated and must have the same lifetime
* as the desired *addr results!
*/