rse 98/04/18 03:54:56
Modified: . STATUS
src CHANGES
src/main http_log.c
Log:
Fix error logging for the startup case where ap_log_error() still uses stderr
as the target. Now the default log level is honored here, too. This
especially removes the confusing mod_so debug messages on startup when
LoadModule commands are used.
Submitted by: Ralf S. Engelschall
Reviewed by: Dean Gaudet, Ralf S. Engelschall
Revision Changes Path
1.304 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- STATUS 1998/04/18 07:40:37 1.303
+++ STATUS 1998/04/18 10:54:53 1.304
@@ -44,6 +44,7 @@
* Lars' Configure fix to avoid confusing message under APACI control
* Ralf's Configure fix for AWK's failing with "string to long" error
+ * Ralf's fix for stderr logging to make sure default loglevel is honored
Available Patches:
1.772 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- CHANGES 1998/04/17 18:49:35 1.771
+++ CHANGES 1998/04/18 10:54:54 1.772
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) Fix error logging for the startup case where ap_log_error() still uses
+ stderr as the target. Now the default log level is honored here, too.
+ [Ralf S. Engelschall]
+
*) PORT: Make sure some AWK's don't fail in src/Configure with "string too
long" errors when generating the MODULES entry for src/Makefile
[Ben Hyde, Ralf S. Engelschall]
1.53 +8 -0 apache-1.3/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- http_log.c 1998/04/11 18:51:34 1.52
+++ http_log.c 1998/04/18 10:54:55 1.53
@@ -284,6 +284,14 @@
FILE *logf;
if (s == NULL) {
+ /*
+ * If we are doing stderr logging (startup), don't log messages that are
+ * above the default server log level unless it is a startup/shutdown
+ * notice
+ */
+ if (((level & APLOG_LEVELMASK) != APLOG_NOTICE) &&
+ ((level & APLOG_LEVELMASK) > DEFAULT_LOGLEVEL))
+ return;
logf = stderr;
}
else if (s->error_log) {
