Add -S as a synonym for -t -DDUMP_VHOSTS

Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Aaron Bannert

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97120 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_main.h b/include/http_main.h
index 46c322acc793ecb2c02925cb31f018ff2b77bd4e..62cf6731131221ed459b82f70a3c53c4fe3e2877 100644 (file)
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -65,7 +65,7 @@
  * in apr_getopt() format.  Use this for default'ing args that the MPM
  * can safely ignore and pass on from its rewrite_args() handler.
  */
-#define AP_SERVER_BASEARGS "C:c:D:d:E:e:f:vVlLth?X"
+#define AP_SERVER_BASEARGS "C:c:D:d:E:e:f:vVlLtSh?X"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/server/main.c b/server/main.c
index 349a1b8f4c6eef9ea7fd96cc48d221f619061841..50d557bda245e374305a1fe3e39377ebecbf2059 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -317,7 +317,7 @@ static void usage(process_rec *process)
                  pad);
 #endif
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                 "       %s [-v] [-V] [-h] [-l] [-L] [-t]", pad);
+                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "Options:");
 
@@ -384,6 +384,8 @@ static void usage(process_rec *process)
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -t -D DUMP_VHOSTS : show parsed settings (currently only "
                  "vhost settings)");
+    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                 "  -S                : a synonym for -t -D DUMP_VHOSTS");   
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -t                : run syntax check for config files");
 
@@ -527,7 +529,13 @@ int main(int argc, const char * const argv[])
         case 't':
             configtestonly = 1;
             break;
-
+        
+        case 'S':
+            configtestonly = 1;
+            new = (char **)apr_array_push(ap_server_config_defines);
+            *new = "DUMP_VHOSTS";
+            break;
+            
         case 'h':
         case '?':
             usage(process);