You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2010/08/10 21:10:20 UTC
svn commit: r984171 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
docs/manual/programs/httpd.xml include/http_main.h server/core.c
server/main.c
Author: jim
Date: Tue Aug 10 19:10:19 2010
New Revision: 984171
URL: http://svn.apache.org/viewvc?rev=984171&view=rev
Log:
Merge r893027 from trunk:
(re)-introduce -T commandline option to suppress documentroot check at startup
PR 41887
Patch by Jan van den Berg
Submitted by: niq
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml
httpd/httpd/branches/2.2.x/include/http_main.h
httpd/httpd/branches/2.2.x/server/core.c
httpd/httpd/branches/2.2.x/server/main.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Aug 10 19:10:19 2010
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.17
+ *) core: (re)-introduce -T commandline option to suppress documentroot
+ check at startup.
+ PR 41887 [Jan van den Berg <janvdberg gmail.com>]
+
Changes with Apache 2.2.16
*) SECURITY: CVE-2010-1452 (cve.mitre.org)
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 10 19:10:19 2010
@@ -87,13 +87,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * core: (re)-introduce -T commandline option to suppress documentroot
- check at startup
- PR 41887
- Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=893027
- 2.2 patch: trunk patch Works with offset.
- +1: niq, rpluem, jim
-
* VHosts: fix parsing of pure-numeric hostname.
PR 44979
Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=832172
Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml Tue Aug 10 19:10:19 2010
@@ -152,6 +152,10 @@ places where the directive is valid.</dd
<dd>Show the settings as parsed from the config file (currently only
shows the virtualhost settings).</dd>
+<dt><code>-T</code></dt>
+
+<dd>Skip document root check at startup/restart.</dd>
+
<dt><code>-t</code></dt>
<dd>Run syntax tests for configuration files only. The program
Modified: httpd/httpd/branches/2.2.x/include/http_main.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/http_main.h?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/http_main.h (original)
+++ httpd/httpd/branches/2.2.x/include/http_main.h Tue Aug 10 19:10:19 2010
@@ -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 @@ AP_DECLARE_DATA extern apr_array_header_
/** 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'
Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Tue Aug 10 19:10:19 2010
@@ -1183,13 +1183,19 @@ static const char *set_document_root(cmd
return err;
}
+ /* When ap_document_root_check is false; skip all the stuff below */
+ if (!ap_document_root_check) {
+ conf->ap_document_root = arg;
+ return NULL;
+ }
+
/* Make it absolute, relative to ServerRoot */
arg = ap_server_root_relative(cmd->pool, arg);
if (arg == NULL) {
return "DocumentRoot must be a directory";
}
- /* 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)) {
Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/main.c?rev=984171&r1=984170&r2=984171&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Tue Aug 10 19:10:19 2010
@@ -361,7 +361,7 @@ static void usage(process_rec *process)
#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:");
@@ -440,10 +440,15 @@ static void usage(process_rec *process)
" -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 */
+AP_DECLARE_DATA int ap_document_root_check = 1;
+
int main(int argc, const char * const argv[])
{
char c;
@@ -592,6 +597,10 @@ int main(int argc, const char * const ar
configtestonly = 1;
break;
+ case 'T':
+ ap_document_root_check = 0;
+ break;
+
case 'S':
configtestonly = 1;
new = (char **)apr_array_push(ap_server_config_defines);