On the trunk:

[apache] / server / main.c

diff --git a/server/main.c b/server/main.c
index 6d4787faddb25d1c3ce3f158a1f175229cbf280c..351f0f1a56f2755d35c156dfc0eb50eb484b9098 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -447,6 +447,8 @@ static void usage(process_rec *process)
                  "  -t -D DUMP_MODULES : show all loaded modules ");
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -M                 : a synonym for -t -D DUMP_MODULES");
+    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                 "  -t -D DUMP_INCLUDES: show all included configuration files");
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -t                 : run syntax check for config files");
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
@@ -546,6 +548,9 @@ int main(int argc, const char * const argv[])
             /* Setting -D DUMP_MODULES is equivalent to setting -M */
             else if (strcmp(opt_arg, "DUMP_MODULES") == 0)
                 ap_run_mode = AP_SQ_RM_CONFIG_DUMP;
+            /* Setting -D DUMP_INCLUDES is a type of configuration dump */
+            else if (strcmp(opt_arg, "DUMP_INCLUDES") == 0)
+                ap_run_mode = AP_SQ_RM_CONFIG_DUMP;
             break;
 
         case 'e':
@@ -807,7 +812,7 @@ int main(int argc, const char * const argv[])
         rc = OK;
     }
     else if (rc != OK) {
-        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, NULL, APLOGNO()
+        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, NULL, APLOGNO(02818)
                      "MPM run failed, exiting");
     }
     destroy_and_exit_process(process, rc);