summaryrefslogtreecommitdiff
path: root/server/log.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-11-21 17:36:26 +0000
committerStefan Fritsch <sf@apache.org>2011-11-21 17:36:26 +0000
commite0184da329410a868800ca4cf36b06cd40335fbe (patch)
treea6b544db881b42d30369273a55ebc753cb7d9a45 /server/log.c
parent78e657406b3d5fdf3b0038dd7e3bf1c56b18e942 (diff)
downloadhttpd-e0184da329410a868800ca4cf36b06cd40335fbe.tar.gz
Pass ap_errorlog_info to error_log hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204614 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/log.c')
-rw-r--r--server/log.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/server/log.c b/server/log.c
index ac446ffe61..605d75bbea 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1177,6 +1177,7 @@ static void log_error_core(const char *file, int line, int module_index,
info.s = s;
info.c = c;
+ info.pool = pool;
info.file = NULL;
info.line = 0;
info.status = 0;
@@ -1268,8 +1269,7 @@ static void log_error_core(const char *file, int line, int module_index,
* prefix and suffix.
*/
errstr[errstr_end] = '\0';
- ap_run_error_log(file, line, module_index, level, status, s, c, r,
- pool, errstr + errstr_start);
+ ap_run_error_log(&info, errstr + errstr_start);
}
*errstr = '\0';
@@ -1763,11 +1763,8 @@ AP_DECLARE(const char *) ap_parse_log_level(const char *str, int *val)
}
AP_IMPLEMENT_HOOK_VOID(error_log,
- (const char *file, int line, int module_index, int level,
- apr_status_t status, const server_rec *s,
- const conn_rec *c, const request_rec *r,
- apr_pool_t *pool, const char *errstr), (file, line,
- module_index, level, status, s, c, r, pool, errstr))
+ (const ap_errorlog_info *info, const char *errstr),
+ (info, errstr))
AP_IMPLEMENT_HOOK_RUN_FIRST(int, generate_log_id,
(const conn_rec *c, const request_rec *r,