diff options
Diffstat (limited to 'base/tps/src/modules/tps')
| -rw-r--r-- | base/tps/src/modules/tps/AP_Context.cpp | 8 | ||||
| -rw-r--r-- | base/tps/src/modules/tps/AP_Session.cpp | 2 | ||||
| -rw-r--r-- | base/tps/src/modules/tps/mod_tps.cpp | 9 |
3 files changed, 11 insertions, 8 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." ); } diff --git a/base/tps/src/modules/tps/AP_Session.cpp b/base/tps/src/modules/tps/AP_Session.cpp index 36f455355..16d6d4e5e 100644 --- a/base/tps/src/modules/tps/AP_Session.cpp +++ b/base/tps/src/modules/tps/AP_Session.cpp @@ -128,7 +128,7 @@ AP_Session::~AP_Session() char *AP_Session::GetRemoteIP() { - return ( m_rq->connection->remote_ip ); + return ( m_rq->connection->client_ip ); } diff --git a/base/tps/src/modules/tps/mod_tps.cpp b/base/tps/src/modules/tps/mod_tps.cpp index dc6cc95f9..7f3d29ca4 100644 --- a/base/tps/src/modules/tps/mod_tps.cpp +++ b/base/tps/src/modules/tps/mod_tps.cpp @@ -122,6 +122,7 @@ typedef struct { */ #define MOD_TPS_CONFIG_KEY tps_module +APLOG_USE_MODULE(tps); static const char MOD_TPS_CONFIG_KEY_NAME[] = "tps_module"; @@ -315,7 +316,7 @@ mod_tps_initialize( apr_pool_t *p, } else { /* Log information regarding this failure. */ ap_log_error( "mod_tps_initialize", - __LINE__, APLOG_ERR, 0, sv, + __LINE__, APLOG_MODULE_INDEX, APLOG_ERR, 0, sv, "The tps module was installed incorrectly since the " "parameter named '%s' is missing from the Apache " "Configuration file!", @@ -337,7 +338,7 @@ mod_tps_initialize( apr_pool_t *p, if( status != RA_INITIALIZATION_SUCCESS ) { /* Log information regarding this failure. */ ap_log_error( "mod_tps_initialize", - __LINE__, APLOG_ERR, 0, sv, + __LINE__, APLOG_MODULE_INDEX, APLOG_ERR, 0, sv, "The tps module was installed incorrectly " "since the file named '%s' does not exist!", cfg_path_file ); @@ -368,7 +369,7 @@ mod_tps_initialize( apr_pool_t *p, if (status != RA_INITIALIZATION_SUCCESS ) { ap_log_error( "mod_tps_initialize", - __LINE__, APLOG_ERR, 0, sv, + __LINE__, APLOG_MODULE_INDEX, APLOG_ERR, 0, sv, "The tps module failed to do the initializeInChild tasks. "); printf( "\nUnable to start Apache:\n" " The tps module failed to do the initializeInChild tasks. "); @@ -636,7 +637,7 @@ static void mod_tps_init_child(apr_pool_t *p, server_rec *sv) if (status != RA_INITIALIZATION_SUCCESS) { /* Need to shut down, the child was not initialized properly. */ ap_log_error( "mod_tps_init_child", - __LINE__, APLOG_ERR, 0, sv, + __LINE__, APLOG_MODULE_INDEX, APLOG_ERR, 0, sv, "The tps module failed to do the initializeInChild tasks. "); printf( "\nUnable to start Apache:\n" " The tps module failed to do the initializeInChild tasks. "); |