jim 99/06/17 04:49:35
Modified: htdocs/manual/mod core.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Always perform the check for DocumentRoot
when doing the config test
Revision Changes Path
1.150 +4 -1 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.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- core.html 1999/06/14 18:41:23 1.149
+++ core.html 1999/06/17 11:49:26 1.150
@@ -778,7 +778,10 @@
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.1380 +3 -1 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- CHANGES 1999/06/16 22:19:16 1.1379
+++ CHANGES 1999/06/17 11:49:28 1.1380
@@ -4,7 +4,9 @@
*) New directive, DocumentRootCheck, added to determine if
we bother doing the stat of each DocumentRoot during
- startup. [Mathijs Maassen <[EMAIL PROTECTED]>. Jim Jagielski]
+ startup. Ignored when using the '-t' command line option
+ to perform a configuration test. [Mathijs Maassen <[EMAIL PROTECTED]>.
+ 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.37 +1 -0 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_conf_globals.h 1999/06/13 19:59:40 1.36
+++ http_conf_globals.h 1999/06/17 11:49:31 1.37
@@ -68,6 +68,7 @@
extern int ap_standalone;
extern int ap_documentroot_check;
+extern int ap_configtestonly;
extern uid_t ap_user_id;
extern char *ap_user_name;
extern gid_t ap_group_id;
1.264 +2 -1 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.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- http_core.c 1999/06/13 19:59:41 1.263
+++ http_core.c 1999/06/17 11:49:32 1.264
@@ -1031,7 +1031,8 @@
return err;
}
- ap_documentroot_check = arg != 0;
+ if (!ap_configtestonly)
+ ap_documentroot_check = arg != 0;
return NULL;
}
1.446 +5 -6 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.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- http_main.c 1999/06/13 19:59:41 1.445
+++ http_main.c 1999/06/17 11:49:33 1.446
@@ -231,6 +231,7 @@
int ap_standalone=0;
int ap_documentroot_check=1;
+int ap_configtestonly=0;
uid_t ap_user_id=0;
char *ap_user_name=NULL;
gid_t ap_group_id=0;
@@ -4634,7 +4635,6 @@
int REALMAIN(int argc, char *argv[])
{
int c;
- int configtestonly = 0;
int sock_in;
int sock_out;
char *s;
@@ -4743,7 +4743,7 @@
ap_dump_settings = 1;
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h':
usage(argv[0]);
@@ -4755,7 +4755,7 @@
ap_suexec_enabled = init_suexec();
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
- if (configtestonly) {
+ if (ap_configtestonly) {
fprintf(stderr, "Syntax OK\n");
exit(0);
}
@@ -6132,7 +6132,6 @@
char *s;
char *service_name = NULL;
int install = 0;
- int configtestonly = 0;
int conf_specified = 0;
char *signal_to_send = NULL;
char cwd[MAX_STRING_LEN];
@@ -6252,7 +6251,7 @@
++one_process; /* Weird debugging mode. */
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h':
usage(ap_server_argv0);
@@ -6313,7 +6312,7 @@
#endif
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
- if (configtestonly) {
+ if (ap_configtestonly) {
fprintf(stderr, "%s: Syntax OK\n",
ap_server_root_relative(pcommands, ap_server_confname));
clean_parent_exit(0);
}
