httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/server main.c
Date Mon, 07 Oct 2002 01:39:21 GMT
aaron       2002/10/06 18:39:20

  Modified:    include  http_main.h
               server   main.c
  Log:
  Add -S as a synonym for -t -DDUMP_VHOSTS
  
  Submitted by:	Thom May <thom@planetarytramp.net>
  Reviewed by:	Aaron Bannert
  
  Revision  Changes    Path
  1.25      +1 -1      httpd-2.0/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_main.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- http_main.h	23 May 2002 12:58:36 -0000	1.24
  +++ http_main.h	7 Oct 2002 01:39:20 -0000	1.25
  @@ -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" {
  
  
  
  1.139     +10 -2     httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- main.c	15 Sep 2002 21:34:08 -0000	1.138
  +++ main.c	7 Oct 2002 01:39:20 -0000	1.139
  @@ -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);
  
  
  

Mime
View raw message