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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index f5307fe7ed2c5d53318ed2e290705b0581c0dc3b..83794beec2b6764a794809d8d573642748135590 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -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

diff --git a/include/http_core.h b/include/http_core.h
index 7b822a52243ce52e7f6a9717cb0a5b007370812d..ca83d417466a720a59618a5ba2dd81761cff2ac1 100644 (file)
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -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;
 
 /**

diff --git a/server/log.c b/server/log.c
index 50d9cbcb3ede20e6fef25e00f321ee94ac19fc86..735fcf823a8a9e770bc681da6ad4c538f5dbcc5d 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -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;