httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1101143 - in /httpd/httpd/trunk: include/ap_mmn.h include/http_core.h server/log.c
Date Mon, 09 May 2011 18:43:51 GMT
Author: trawick
Date: Mon May  9 18:43:50 2011
New Revision: 1101143

URL: http://svn.apache.org/viewvc?rev=1101143&view=rev
Log:
allow error log formatters to peek at the message format

Modified:
    httpd/httpd/trunk/include/ap_mmn.h
    httpd/httpd/trunk/include/http_core.h
    httpd/httpd/trunk/server/log.c

Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1101143&r1=1101142&r2=1101143&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Mon May  9 18:43:50 2011
@@ -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

Modified: httpd/httpd/trunk/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_core.h?rev=1101143&r1=1101142&r2=1101143&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_core.h (original)
+++ httpd/httpd/trunk/include/http_core.h Mon May  9 18:43:50 2011
@@ -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;
 
 /**

Modified: httpd/httpd/trunk/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=1101143&r1=1101142&r2=1101143&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Mon May  9 18:43:50 2011
@@ -1166,7 +1166,7 @@ static void log_error_core(const char *f
     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;



Mime
View raw message