[Patch] Add -S as a synonym for -t -DDUMP_VHOSTS

[Thom May]

This allows people who are used to the 1.3 argument to continue working in
the style they are used to...
Cheers,
-Thom
-- 
Thom May -> [EMAIL PROTECTED]

<moshez> wiggy: I just hurt other people. because I am evil!!!!!!
         muhahahahahahahaha! evil, I tell you, evil!!!!


Index: include/http_main.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/include/http_main.h,v
retrieving revision 1.24
diff -u -u -r1.24 http_main.h
--- include/http_main.h 23 May 2002 12:58:36 -0000      1.24
+++ include/http_main.h 5 Oct 2002 22:17:35 -0000
@@ -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" {
Index: server/main.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/main.c,v
retrieving revision 1.138
diff -u -u -r1.138 main.c
--- server/main.c       15 Sep 2002 21:34:08 -0000      1.138
+++ server/main.c       5 Oct 2002 22:17:41 -0000
@@ -317,7 +317,7 @@
                  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:");
 
@@ -385,6 +385,8 @@
                  "  -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");
 
     destroy_and_exit_process(process, 1);
@@ -527,7 +529,13 @@
         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);