Commit d87e47c3 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get -t -D DUMP_VHOSTS working and properly documented. This removes the 

-S option from the docs.


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

server/main.c

+22 −23
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static void usage(process_rec *process) 
    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");
@@ -277,8 +277,7 @@ static void usage(process_rec *process) 
    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 -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 */

server/vhost.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ void ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s) 
#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);