httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1201358 - in /httpd/httpd/branches/2.4.x: CHANGES server/main.c
Date Sat, 12 Nov 2011 23:52:15 GMT
Author: trawick
Date: Sat Nov 12 23:52:14 2011
New Revision: 1201358

URL: http://svn.apache.org/viewvc?rev=1201358&view=rev
Log:
Merge r1201354 from trunk:

Server directive display (-L): Include directives of DSOs.

Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/server/main.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1201358&r1=1201357&r2=1201358&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Nov 12 23:52:14 2011
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/main.c?rev=1201358&r1=1201357&r2=1201358&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/main.c (original)
+++ httpd/httpd/branches/2.4.x/server/main.c Sat Nov 12 23:52:14 2011
@@ -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 ar
             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 ar
             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)



Mime
View raw message