View | Details | Raw Unified | Return to bug 41887
Collapse All | Expand All

(-)server/core.c (-1 / +7 lines)
Lines 1133-1140 Link Here
1133
    /* Make it absolute, relative to ServerRoot */
1133
    /* Make it absolute, relative to ServerRoot */
1134
    arg = ap_server_root_relative(cmd->pool, arg);
1134
    arg = ap_server_root_relative(cmd->pool, arg);
1135
    /* TODO: ap_configtestonly && ap_docrootcheck && */
1135
1136
    /* When ap_document_root_check is false; skip all the stuff below */
1137
    if (!ap_document_root_check) {
1138
       conf->ap_document_root = arg;
1139
       return NULL;
1140
    }
1141
    /* TODO: ap_configtestonly */
1136
    if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg,
1142
    if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg,
1137
                           APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
1143
                           APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
1138
        || !ap_is_directory(cmd->pool, arg)) {
1144
        || !ap_is_directory(cmd->pool, arg)) {
(-)server/main.c (-1 / +10 lines)
Lines 352-358 Link Here
352
#endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
352
#endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
353
#endif
353
#endif
354
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
354
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
355
                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
355
                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S]", pad);
356
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
356
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
357
                 "Options:");
357
                 "Options:");
Lines 431-440 Link Here
431
                 "  -M                 : a synonym for -t -D DUMP_MODULES");
431
                 "  -M                 : a synonym for -t -D DUMP_MODULES");
432
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
432
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
433
                 "  -t                 : run syntax check for config files");
433
                 "  -t                 : run syntax check for config files");
434
    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
435
                "  -T                 : start without DocumentRoot(s) check");
434
    destroy_and_exit_process(process, 1);
436
    destroy_and_exit_process(process, 1);
435
}
437
}
438
/* Set ap_document_root_check to default value: true */
439
int ap_document_root_check = 1;
440
436
int main(int argc, const char * const argv[])
441
int main(int argc, const char * const argv[])
437
{
442
{
438
    char c;
443
    char c;
Lines 588-593 Link Here
588
        case 't':
593
        case 't':
589
            configtestonly = 1;
594
            configtestonly = 1;
590
            break;
595
            break;
596
597
       case 'T':
598
           ap_document_root_check = 0;
599
           break;
591
        case 'S':
600
        case 'S':
592
            configtestonly = 1;
601
            configtestonly = 1;
(-)include/http_main.h (-1 / +3 lines)
Lines 32-38 Link Here
32
 * in apr_getopt() format.  Use this for default'ing args that the MPM
32
 * in apr_getopt() format.  Use this for default'ing args that the MPM
33
 * can safely ignore and pass on from its rewrite_args() handler.
33
 * can safely ignore and pass on from its rewrite_args() handler.
34
 */
34
 */
35
#define AP_SERVER_BASEARGS "C:c:D:d:E:e:f:vVlLtSMh?X"
35
#define AP_SERVER_BASEARGS "C:c:D:d:E:e:f:vVlLtTSMh?X"
36
#ifdef __cplusplus
36
#ifdef __cplusplus
37
extern "C" {
37
extern "C" {
Lines 53-58 Link Here
53
/** An array of all -D defines on the command line.  This allows people to
53
/** An array of all -D defines on the command line.  This allows people to
54
 *  effect the server based on command line options */
54
 *  effect the server based on command line options */
55
AP_DECLARE_DATA extern apr_array_header_t *ap_server_config_defines;
55
AP_DECLARE_DATA extern apr_array_header_t *ap_server_config_defines;
56
/** Available integer for using the -T switch */
57
AP_DECLARE_DATA extern int ap_document_root_check;
56
/**
58
/**
57
 * An optional function to send signal to server on presence of '-k'
59
 * An optional function to send signal to server on presence of '-k'

Return to bug 41887