jim 99/06/24 09:38:54
Modified: . STATUS
htdocs/manual/mod core.html directives.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Backout the DocumentRootCheck stuff.
I wash my hands of this... :)
Revision Changes Path
1.722 +1 -15 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.721
retrieving revision 1.722
diff -u -r1.721 -r1.722
--- STATUS 1999/06/24 16:09:47 1.721
+++ STATUS 1999/06/24 16:38:31 1.722
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/06/24 16:09:47 $]
+ Last modified at [$Date: 1999/06/24 16:38:31 $]
Release:
@@ -70,20 +70,6 @@
proxy.
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
-
- * What to do about DocumentRootCheck?
- After commited Dean and Brian suggested just getting rid of
- the stat itself and removing the need for the directive. Jim
- points out that it's useful to have the stat for the -t
- command line.
-
- Votes:
- Keep as is:
- Remove directive and stat totally^:
- Remove directive but keep stat for -t^:
- whatever/don't care:
-
- ^ = CHANGES needs big bold notice about this change.
* mod_rewrite/3874: RewriteLock doesn't work for virtual hosts
Status: (Ralf): When I find time, I can look at this. But
1.153 +0 -39 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- core.html 1999/06/22 01:11:09 1.152
+++ core.html 1999/06/24 16:38:33 1.153
@@ -36,7 +36,6 @@
<LI><A HREF="#directory"><Directory></A>
<LI><A HREF="#directorymatch"><DirectoryMatch></A>
<LI><A HREF="#documentroot">DocumentRoot</A>
-<LI><A HREF="#documentrootcheck">DocumentRootCheck</A>
<LI><A HREF="#errordocument">ErrorDocument</A>
<LI><A HREF="#errorlog">ErrorLog</A>
<LI><A HREF="#files"><Files></A>
@@ -744,44 +743,6 @@
<P>There appears to be a bug in mod_dir which causes problems when the
DocumentRoot has a trailing slash (<EM>i.e.</EM>, "DocumentRoot /usr/web/")
so
please avoid that.
-
-<P><HR>
-
-<H2><A NAME="documentrootcheck">DocumentRootCheck directive</A></H2>
-<!--%plaintext <?INDEX {\tt DocumentRootCheck} directive> -->
-<A
- HREF="directive-dict.html#Syntax"
- REL="Help"
-><STRONG>Syntax:</STRONG></A> DocumentRootCheck <EM>On/Off</EM><BR>
-<A
- HREF="directive-dict.html#Default"
- REL="Help"
-><STRONG>Default:</STRONG></A> <CODE>DocumentRootCheck On</CODE><BR>
-<A
- HREF="directive-dict.html#Context"
- REL="Help"
-><STRONG>Context:</STRONG></A> server config<BR>
-<A
- HREF="directive-dict.html#Status"
- REL="Help"
-><STRONG>Status:</STRONG></A> core<BR>
-<A
- HREF="directive-dict.html#Compatibility"
- REL="Help"
-><STRONG>Compatibility:</STRONG></A> Available in Apache 1.3.7 and later
-<P>
-During startup, Apache does a <CODE>stat</CODE> of each
-<A HREF="#documentroot">DocumentRoot</A>
-to determine if the directory exists. If your server is
-configured with lots of DocumentRoot directives (for example,
-if you serve numerous virtual hosts), this can <em>greatly</em> increase
-the startup time. If you are sure that all the DocumentRoot
-entries exist, you can tell Apache to bypass this check using:
-<BLOCKQUOTE><CODE>DocumentRootCheck Off</CODE></BLOCKQUOTE>
-<P>
-This directive is ignored when Apache is called with the
-<CODE>-t</CODE> command line option to perform a configuration
-test.
<P><HR>
1.58 +0 -1 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===================================================================
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- directives.html 1999/06/13 19:59:37 1.57
+++ directives.html 1999/06/24 16:38:34 1.58
@@ -95,7 +95,6 @@
<LI><A HREF="core.html#directorymatch"><DirectoryMatch></A>
<LI><A HREF="mod_dir.html#directoryindex">DirectoryIndex</A>
<LI><A HREF="core.html#documentroot">DocumentRoot</A>
-<LI><A HREF="core.html#documentrootcheck">DocumentRootCheck</A>
<LI><A HREF="core.html#errordocument">ErrorDocument</A>
<LI><A HREF="core.html#errorlog">ErrorLog</A>
<LI><A HREF="mod_example.html#example">Example</A>
1.1387 +7 -5 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -r1.1386 -r1.1387
--- CHANGES 1999/06/24 14:30:32 1.1386
+++ CHANGES 1999/06/24 16:38:35 1.1387
@@ -16,11 +16,13 @@
*) Fix apxs build issues on AIX
[Rasmus Lerdorf <[EMAIL PROTECTED]>]
- *) New directive, DocumentRootCheck, added to determine if
- we bother doing the stat of each DocumentRoot during
- startup. Ignored when using the '-t' command line option
- to perform a configuration test. [Mathijs Maassen <[EMAIL PROTECTED]>.
- Jim Jagielski]
+ *) STARTUP BEHAVIOR CHANGE: Under previous versions, when Apache
+ first started up, it used to do a stat of each DocumentRoot to
+ see if it existed and was a directory. If not, then an error
+ message was printed. THIS HAS BEEN DISABLED. If DocumentRoot
+ does not exist, you will get error messages in error_log. If
+ the '-t' command line option is used (to check the configuration)
+ the check of DocumentRoot IS performed. [Jim Jagielski]
*) Win32: The query switch "apache -S" didn't exit after showing the
vhost settings. That was inconsistent with the other query functions.
1.38 +0 -1 apache-1.3/src/include/http_conf_globals.h
Index: http_conf_globals.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- http_conf_globals.h 1999/06/17 11:49:31 1.37
+++ http_conf_globals.h 1999/06/24 16:38:41 1.38
@@ -67,7 +67,6 @@
*/
extern int ap_standalone;
-extern int ap_documentroot_check;
extern int ap_configtestonly;
extern uid_t ap_user_id;
extern char *ap_user_name;
1.267 +1 -16 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- http_core.c 1999/06/22 15:33:14 1.266
+++ http_core.c 1999/06/24 16:38:45 1.267
@@ -1025,7 +1025,7 @@
}
arg = ap_os_canonical_filename(cmd->pool, arg);
- if (ap_documentroot_check && !ap_is_directory(arg)) {
+ if (ap_configtestonly && !ap_is_directory(arg)) {
if (cmd->server->is_virtual) {
fprintf(stderr, "Warning: DocumentRoot [%s] does not exist\n",
arg);
@@ -1039,19 +1039,6 @@
return NULL;
}
-static const char *set_document_root_check(cmd_parms *cmd, void *dummy, int
arg)
-{
- const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-
- if (err != NULL) {
- return err;
- }
-
- if (!ap_configtestonly)
- ap_documentroot_check = arg != 0;
- return NULL;
-}
-
API_EXPORT(void) ap_custom_response(request_rec *r, int status, char *string)
{
core_dir_config *conf =
@@ -2773,8 +2760,6 @@
"Name(s) of per-directory config files (default: .htaccess)" },
{ "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1,
"Root directory of the document tree" },
-{ "DocumentRootCheck", set_document_root_check, NULL, RSRC_CONF, FLAG,
- "En-/Disable checking for existance of DocumentRoot during startup" },
{ "ErrorDocument", set_error_document, NULL, OR_FILEINFO, RAW_ARGS,
"Change responses for HTTP errors" },
{ "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS,
1.450 +0 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- http_main.c 1999/06/24 14:30:30 1.449
+++ http_main.c 1999/06/24 16:38:50 1.450
@@ -230,7 +230,6 @@
*/
int ap_standalone=0;
-int ap_documentroot_check=1;
int ap_configtestonly=0;
uid_t ap_user_id=0;
char *ap_user_name=NULL;
