mirror of
https://github.com/apache/httpd.git
synced 2025-07-29 12:37:06 +00:00
allow error log formatters to peek at the message format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101143 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -320,6 +320,7 @@
|
||||
* change AP_CORE_DECLARE to AP_DECLARE: ap_create_request_config()
|
||||
* change AP_DECLARE to AP_CORE_DECLARE: ap_register_log_hooks()
|
||||
* 20110329.2 (2.3.12-dev) Add child_status and end_generation hooks.
|
||||
* 20110329.3 (2.3.12-dev) Add format field to ap_errorlog_info.
|
||||
*/
|
||||
|
||||
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
|
||||
@ -327,7 +328,7 @@
|
||||
#ifndef MODULE_MAGIC_NUMBER_MAJOR
|
||||
#define MODULE_MAGIC_NUMBER_MAJOR 20110329
|
||||
#endif
|
||||
#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
|
||||
#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */
|
||||
|
||||
/**
|
||||
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
|
||||
|
@ -718,6 +718,9 @@ typedef struct ap_errorlog_info {
|
||||
int using_syslog;
|
||||
/** 1 if APLOG_STARTUP was set for the log message, 0 otherwise */
|
||||
int startup;
|
||||
|
||||
/** message format */
|
||||
const char *format;
|
||||
} ap_errorlog_info;
|
||||
|
||||
/**
|
||||
|
@ -1166,7 +1166,7 @@ static void log_error_core(const char *file, int line, int module_index,
|
||||
info.status = 0;
|
||||
info.using_syslog = (logf == NULL);
|
||||
info.startup = ((level & APLOG_STARTUP) == APLOG_STARTUP);
|
||||
|
||||
info.format = fmt;
|
||||
|
||||
while (!done) {
|
||||
apr_array_header_t *log_format;
|
||||
|
Reference in New Issue
Block a user