From 3fb597edadc14a70caa6281fb256da33c6a72614 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Sat, 12 Nov 2011 23:52:14 +0000 Subject: [PATCH] Merge r1201354 from trunk: Server directive display (-L): Include directives of DSOs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201358 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/main.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index df4d48451b..ccaa2dc0a7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.0 + *) Server directive display (-L): Include directives of DSOs. + [Jeff Trawick] + *) mod_cache: Make sure we merge headers correctly when we handle a non cacheable conditional response. PR52120. [Graham Leggett] diff --git a/server/main.c b/server/main.c index 1cb2f75d9c..778e812169 100644 --- a/server/main.c +++ b/server/main.c @@ -438,7 +438,7 @@ static void usage(process_rec *process) int main(int argc, const char * const argv[]) { char c; - int showcompile = 0; + int showcompile = 0, showdirectives = 0; const char *confname = SERVER_CONFIG_FILE; const char *def_server_root = HTTPD_ROOT; const char *temp_error_log = NULL; @@ -553,8 +553,9 @@ int main(int argc, const char * const argv[]) destroy_and_exit_process(process, 0); case 'L': - ap_show_directives(); - destroy_and_exit_process(process, 0); + ap_run_mode = AP_SQ_RM_CONFIG_DUMP; + showdirectives = 1; + break; case 't': if (ap_run_mode == AP_SQ_RM_UNKNOWN) @@ -657,6 +658,10 @@ int main(int argc, const char * const argv[]) if (showcompile) { /* deferred due to dynamically loaded MPM */ show_compile_settings(); } + else if (showdirectives) { /* deferred in case of DSOs */ + ap_show_directives(); + destroy_and_exit_process(process, 0); + } else { ap_run_test_config(pconf, ap_server_conf); if (ap_run_mode == AP_SQ_RM_CONFIG_TEST) -- 2.40.0