[patch] DocumentRoot check option for 2.3.0

documentroot_check_2.3.0.patch (text/plain), 2.99 KB, created by Jan van den Berg on 2007-03-19 07:28:45 UTC

(hide)

Description: DocumentRoot check option for 2.3.0

Filename:

MIME Type:

Creator: Jan van den Berg

Created: 2007-03-19 07:28:45 UTC

Size: 2.99 KB

patch

obsolete

>Index: server/core.c >=================================================================== >--- server/core.c (revision 519919) >+++ server/core.c (working copy) >@@ -1133,8 +1133,14 @@ > > /* Make it absolute, relative to ServerRoot */ > arg = ap_server_root_relative(cmd->pool, arg); >+ >+ /* When ap_document_root_check is false; skip all the stuff below */ >+ if (!ap_document_root_check) { >+ conf->ap_document_root = arg; >+ return NULL; >+ } > >- /* TODO: ap_configtestonly && ap_docrootcheck && */ >+ /* TODO: ap_configtestonly */ > if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg, > APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS > || !ap_is_directory(cmd->pool, arg)) { >Index: server/main.c >=================================================================== >--- server/main.c (revision 519919) >+++ server/main.c (working copy) >@@ -352,7 +352,7 @@ > #endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */ > #endif > ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, >- " %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad); >+ " %s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S]", pad); > ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, > "Options:"); > >@@ -431,10 +431,15 @@ > " -M : a synonym for -t -D DUMP_MODULES"); > ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, > " -t : run syntax check for config files"); >+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, >+ " -T : start without DocumentRoot(s) check"); > > destroy_and_exit_process(process, 1); > } > >+/* Set ap_document_root_check to default value: true */ >+int ap_document_root_check = 1; >+ > int main(int argc, const char * const argv[]) > { > char c; >@@ -588,6 +593,10 @@ > case 't': > configtestonly = 1; > break; >+ >+ case 'T': >+ ap_document_root_check = 0; >+ break; > > case 'S': > configtestonly = 1; >Index: include/http_main.h >=================================================================== >--- include/http_main.h (revision 519919) >+++ include/http_main.h (working copy) >@@ -32,7 +32,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:vVlLtSMh?X" >+#define AP_SERVER_BASEARGS "C:c:D:d:E:e:f:vVlLtTSMh?X" > > #ifdef __cplusplus > extern "C" { >@@ -53,6 +53,8 @@ > /** An array of all -D defines on the command line. This allows people to > * effect the server based on command line options */ > AP_DECLARE_DATA extern apr_array_header_t *ap_server_config_defines; >+/** Available integer for using the -T switch */ >+AP_DECLARE_DATA extern int ap_document_root_check; > > /** > * An optional function to send signal to server on presence of '-k' View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]