cvs commit: apache-1.3/src/main http_main.c

[rse]

rse         99/08/10 06:54:49

  Modified:    src/support httpd.8
               src/main http_main.c
  Log:
  Fix the -T stuff
  
  Revision  Changes    Path
  1.15      +11 -0     apache-1.3/src/support/httpd.8
  
  Index: httpd.8
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/httpd.8,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- httpd.8   1999/07/13 15:19:48     1.14
  +++ httpd.8   1999/08/10 13:54:47     1.15
  @@ -92,6 +92,12 @@
   [
   .B \-S
   ] 
  +[
  +.B \-t
  +] 
  +[
  +.B \-T
  +]
   
   .SH DESCRIPTION
   .B httpd
  @@ -163,6 +169,11 @@
   Run syntax tests for configuration files only. The program immediately exits
   after these syntax parsing with either a return code of 0 (Syntax OK) or
   return code not equal to 0 (Syntax Error).
  +.TP
  +.B \-T
  +Same as option 
  +.B \-t
  +but does not check the configured document roots. 
   .TP
   .B \-X
   Run in single-process mode, for internal debugging purposes only; the daemon
  
  
  
  1.471     +3 -2      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.470
  retrieving revision 1.471
  diff -u -r1.470 -r1.471
  --- http_main.c       1999/08/09 07:54:52     1.470
  +++ http_main.c       1999/08/10 13:54:48     1.471
  @@ -1034,7 +1034,7 @@
       fprintf(stderr, "Usage: %s [-D name] [-d directory] [-f file]\n", bin);
   #endif
       fprintf(stderr, "       %s [-C \"directive\"] [-c \"directive\"]\n", 
pad);
  -    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n", pad);
  +    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-L] [-S] [-t] [-T]\n", 
pad);
   #ifdef WIN32
       fprintf(stderr, "       %s [-n service] [-k signal] [-i] [-u]\n", pad);
   #endif
  @@ -1053,7 +1053,8 @@
       fprintf(stderr, "  -l               : list compiled-in modules\n");
       fprintf(stderr, "  -L               : list available configuration 
directives\n");
       fprintf(stderr, "  -S               : show parsed settings (currently 
only vhost settings)\n");
  -    fprintf(stderr, "  -t               : run syntax test for configuration 
files only\n");
  +    fprintf(stderr, "  -t               : run syntax check for config files 
(with docroot check)\n");
  +    fprintf(stderr, "  -T               : run syntax check for config files 
(without docroot check)\n");
   #ifdef WIN32
       fprintf(stderr, "  -n name          : set service name and use its 
ServerConfigFile\n");
       fprintf(stderr, "  -k shutdown      : tell running Apache to 
shutdown\n");