httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: httpd-2.0/server main.c vhost.c
Date Sun, 17 Dec 2000 22:47:33 GMT
rbb         00/12/17 14:47:32

  Modified:    server   main.c vhost.c
  Log:
  Get -t -D DUMP_VHOSTS working and properly documented.  This removes the
  -S option from the docs.
  
  Revision  Changes    Path
  1.78      +21 -22    httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- main.c	2000/12/16 11:45:13	1.77
  +++ main.c	2000/12/17 22:47:32	1.78
  @@ -254,33 +254,32 @@
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "       %s [-n service_name]",
pad);
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "       %s [-i] [-u]",
pad);
   #endif
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "       %s [-v] [-V]
[-h] [-l] [-L] [-S] [-t] [-T]", pad);
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "       %s [-v] [-V]
[-h] [-l] [-L] [-t] [-T]", pad);
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Options:");
   #ifdef SHARED_CORE
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -R directory  
  : specify an alternate location for shared object files");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -R directory  
   : specify an alternate location for shared object files");
   #endif
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -D name       
  : define a name for use in <IfDefine name> directives");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -d directory  
  : specify an alternate initial ServerRoot");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -f file       
  : specify an alternate ServerConfigFile");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -C \"directive\"
  : process directive before reading config files");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -c \"directive\"
  : process directive after  reading config files");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -D name       
   : define a name for use in <IfDefine name> directives");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -d directory  
   : specify an alternate initial ServerRoot");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -f file       
   : specify an alternate ServerConfigFile");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -C \"directive\"
   : process directive before reading config files");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -c \"directive\"
   : process directive after  reading config files");
   #ifdef WIN32
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -n name       
  : set service name and use its ServerConfigFile");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k shutdown   
  : tell running Apache to shutdown");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k restart    
  : tell running Apache to do a graceful restart");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k start      
  : tell Apache to start");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -i            
  : install an Apache service");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -u            
  : uninstall an Apache service");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -n name       
   : set service name and use its ServerConfigFile");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k shutdown   
   : tell running Apache to shutdown");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k restart    
   : tell running Apache to do a graceful restart");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -k start      
   : tell Apache to start");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -i            
   : install an Apache service");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -u            
   : uninstall an Apache service");
   #endif
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -v            
  : show version number");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -V            
  : show compile settings");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -h            
  : list available command line options (this page)");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -l            
  : list compiled in modules");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -L            
  : list available configuration directives");
  -    /* TODOC: -S has been replaced by '-t -D DUMP_VHOSTS' */
  -    /* ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -S         
     : show parsed settings (currently only vhost settings)"); */
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -t            
  : run syntax check for config files (with docroot check)");
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -T            
  : run syntax check for config files (without docroot check)");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -v            
   : show version number");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -V            
   : show compile settings");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -h            
   : list available command line options (this page)");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -l            
   : list compiled in modules");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -L            
   : list available configuration directives");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -t -D DUMP_VHOSTS
: show parsed settings (currently only vhost settings)"); 
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -t            
   : run syntax check for config files (with docroot check)");
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "  -T            
   : run syntax check for config files (without docroot check)");
       /* TODOC: -X goes away, expect MPMs to use -D options */
       destroy_and_exit_process(process, 1);
   }
  
  
  
  1.48      +1 -1      httpd-2.0/server/vhost.c
  
  Index: vhost.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- vhost.c	2000/12/16 21:36:33	1.47
  +++ vhost.c	2000/12/17 22:47:32	1.48
  @@ -700,7 +700,7 @@
   #ifdef IPHASH_STATISTICS
       dump_iphash_statistics(main_s);
   #endif
  -    if (getenv("DUMP_VHOSTS")) {
  +    if (ap_exists_config_define("DUMP_VHOSTS")) {
           apr_file_t *thefile = NULL;
           apr_open_stderr(&thefile, p);
   	dump_vhost_config(thefile);
  
  
  

Mime
View raw message