martin 99/01/08 00:48:47
Modified: . STATUS
src CHANGES
src/main http_main.c
Log:
The query switch "httpd -S" didn't exit after showing the
vhost settings. That was inconsistent with the other query functions.
Now it exits after printing.
Reviewed by: Roy Fielding, Dean Gaudet
Revision Changes Path
1.594 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- STATUS 1999/01/07 22:39:17 1.593
+++ STATUS 1999/01/08 08:48:43 1.594
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/07 22:39:17 $]
+ Last modified at [$Date: 1999/01/08 08:48:43 $]
Release:
@@ -56,10 +56,6 @@
vhost-xxx.html document out of it. -- rse
Available Patches:
-
- * Martin's [PATCH] Make "-S" exit(0) after dumping the VHost settings
- Message-ID: <[EMAIL PROTECTED]>
- Status: Martin +1, Roy +1
* Jim Patterson's patch to make mod_info work on Win32
Message-ID: PR#1442
1.1206 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1205
retrieving revision 1.1206
diff -u -r1.1205 -r1.1206
--- CHANGES 1999/01/06 19:14:49 1.1205
+++ CHANGES 1999/01/08 08:48:44 1.1206
@@ -1,5 +1,9 @@
Changes with Apache 1.3.4
+ *) The query switch "httpd -S" didn't exit after showing the
+ vhost settings. That was inconsistent with the other query functions.
+ [Martin Kraemer]
+
*) Moved the MODULE_MAGIC_COOKIE from before the versions and
filename to the end of the STANDARD_MODULE_STUFF. Its
presence at the beginning prevented reporting of the filename
1.419 +4 -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.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- http_main.c 1999/01/03 16:45:25 1.418
+++ http_main.c 1999/01/08 08:48:46 1.419
@@ -247,7 +247,7 @@
time_t ap_restart_time;
int ap_suexec_enabled = 0;
int ap_listenbacklog;
-int ap_dump_settings;
+int ap_dump_settings = 0;
API_VAR_EXPORT int ap_extended_status = 0;
/*
@@ -4576,6 +4576,9 @@
if (configtestonly) {
fprintf(stderr, "Syntax OK\n");
+ exit(0);
+ }
+ if (ap_dump_settings) {
exit(0);
}
