Port TPS to httpd 2.4

The API changed between httpd 2.2 and 2.4.  We now need to pass
the module index to ap_log_error() when calling it.  The remote_ip
member of the connection struct also was renamed to client_ip.

1 files changed, 5 insertions, 3 deletions

diff --git a/base/tps/src/modules/tps/AP_Context.cpp b/base/tps/src/modules/tps/AP_Context.cpp
index cde314254..b7e0242fb 100644
--- a/base/tps/src/modules/tps/AP_Context.cpp
+++ b/base/tps/src/modules/tps/AP_Context.cpp
@@ -31,6 +31,8 @@ extern "C"
 
 #define MAX_LOG_MSG_SIZE               4096
 
+APLOG_USE_MODULE(tps);
+
 
 AP_Context::AP_Context( server_rec *sv )
 {
@@ -53,7 +55,7 @@ void AP_Context::LogError( const char *func, int line, const char *fmt, ... )
     PR_vsnprintf( buf, MAX_LOG_MSG_SIZE, fmt, argp );
     va_end( argp );
 
-    ap_log_error( func, line, APLOG_ERR, 0, m_sv, buf );
+    ap_log_error( func, line, APLOG_MODULE_INDEX, APLOG_ERR, 0, m_sv, buf );
 }
 
 
@@ -66,13 +68,13 @@ void AP_Context::LogInfo( const char *func, int line, const char *fmt, ... )
     PR_vsnprintf( buf, MAX_LOG_MSG_SIZE, fmt, argp );
     va_end( argp );
 
-    ap_log_error( func, line, APLOG_INFO, 0, m_sv, buf );
+    ap_log_error( func, line, APLOG_MODULE_INDEX, APLOG_INFO, 0, m_sv, buf );
 }
 
 
 void AP_Context::InitializationError( const char *func, int line )
 {
-    ap_log_error( func, line, APLOG_INFO, 0, m_sv,
+    ap_log_error( func, line, APLOG_MODULE_INDEX, APLOG_INFO, 0, m_sv,
                   "The nss module must be initialized "
                   "prior to calling the tps module." );
 }