code-sweet-code
diff --git a/‎configure.in‎
Lines changed: 3 additions & 0 deletions b/‎configure.in‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎include/ap_mmn.h‎
Lines changed: 6 additions & 1 deletion b/‎include/ap_mmn.h‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎include/http_config.h‎
Lines changed: 50 additions & 0 deletions b/‎include/http_config.h‎
Lines changed: 50 additions & 0 deletions
@@ -170,6 +170,9 @@ dnl PCRE and for our config tests will be whatever PCRE determines.
 AC_PROG_CC
 AC_PROG_CPP
 
+dnl Try to get c99 support for variadic macros
+AC_PROG_CC_C99
+
 if test "x${cache_file}" = "x/dev/null"; then
   # Likewise, ensure that CC and CPP are passed through to the pcre
   # configure script iff caching is disabled (the autoconf 2.5x default).
 
@@ -221,12 +221,17 @@
  * 20100223.1 (2.3.6-dev)  Added ap_process_fnmatch_configs().
  * 20100504.0 (2.3.6-dev)  Added name arg to ap_{proc,global}_mutex_create().
  * 20100604.0 (2.3.6-dev)  Remove unused core_dir_config::loglevel
+ * 20100606.0 (2.3.6-dev)  Make ap_log_*error macro wrappers around
+ *                         ap_log_*error_ to save argument preparation and
+ *                         function call overhead.
+ *                         Introduce per-module loglevels
+ *
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20100604
+#define MODULE_MAGIC_NUMBER_MAJOR 20100606
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 
 
@@ -28,6 +28,7 @@
 
 #include "apr_hooks.h"
 #include "util_cfgtree.h"
+#include "ap_config.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -394,6 +395,17 @@ struct module_struct {
     void (*register_hooks) (apr_pool_t *p);
 };
 
+/*
+ * Macro to choose which module a file belongs to, for logging.
+ */
+#define APLOG_USE_MODULE(foo) \
+    extern module AP_MODULE_DECLARE_DATA foo##_module;                  \
+    static int * const aplog_module_index = &(foo##_module.module_index)
+
+#define AP_DECLARE_MODULE(foo) \
+    APLOG_USE_MODULE(foo);                         \
+    module AP_MODULE_DECLARE_DATA foo##_module
+
 /**
  * @defgroup ModuleInit Module structure initializers
  *
@@ -469,6 +481,44 @@ AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
 #endif /* AP_DEBUG */
 
 
+/**
+ * Generic accessor for modules to get the module-specific loglevel
+ * @param s The server from which to get the loglevel.
+ * @param index The module_index of the module to get the loglevel for.
+ * @return The module-specific loglevel
+ */
+AP_DECLARE(int) ap_get_module_loglevel(const server_rec *s, int index);
+
+/**
+ * Accessor to set module-specific loglevel
+ * @param p A pool
+ * @param s The server for which to set the loglevel.
+ * @param index The module_index of the module to set the loglevel for.
+ * @param level The new log level
+ * @return The module-specific loglevel
+ */
+AP_DECLARE(void) ap_set_module_loglevel(apr_pool_t *p, server_rec *s,
+                                        int index, int level);
+
+#if !defined(AP_DEBUG)
+
+#define ap_get_module_loglevel(s,i)	        \
+    (i < 0 || (s)->module_loglevels == NULL || (((s)->module_loglevels)[i]) < 0 ?   \
+     (s)->loglevel :                            \
+     ((s)->module_loglevels)[i])
+
+#endif /* AP_DEBUG */
+
+/**
+ * Reset all module-specific loglevels to server default
+ * @param p A pool
+ * @param s The server for which to set the loglevel.
+ * @param index The module_index of the module to set the loglevel for.
+ * @param level The new log level
+ * @return The module-specific loglevel
+ */
+AP_DECLARE(void) ap_reset_module_loglevels(server_rec *s);
+
 /**
  * Generic command handling function for strings
  * @param cmd The command parameters for this directive