randy 97/08/22 19:59:46
Modified: src CHANGES
src/modules/standard mod_log_config.c
Log:
If no TransferLog is given explicitly, decline to log.
This supports coexistence with other logging modules,
such as the custom one that UUNET uses.
Submitted by: David J. MacKenzie <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet, Brian Behlendorf, Randy Terbush
Revision Changes Path
1.410 +4 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- CHANGES 1997/08/23 02:55:22 1.409
+++ CHANGES 1997/08/23 02:59:36 1.410
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) If no TransferLog is given explicitly, decline
+ to log. This supports coexistence with other logging modules,
+ such as the custom one that UUNET uses. [David J. MacKenzie]
+
*) Check for titles in server-parsed HTML files.
Ignore leading newlines and returns in titles. The old behavior
of replacing a newline after <title> with a space causes the
1.36 +11 -0 apachen/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_config.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_log_config.c 1997/08/18 13:12:14 1.35
+++ mod_log_config.c 1997/08/23 02:59:45 1.36
@@ -51,6 +51,9 @@
*/
/*
+ * Modified by [EMAIL PROTECTED]:
+ * If no TransferLog is given explicitly, decline to log.
+ *
* This is module implements the TransferLog directive (same as the
* common log module), and additional directives, LogFormat and CustomLog.
*
@@ -532,6 +535,10 @@
int len = 0;
array_header *format;
+ if (cls->fname == NULL) {
+ return DECLINED;
+ }
+
format = cls->format ? cls->format : default_format;
strsa= make_array(r->pool, format->nelts,sizeof(char*));
@@ -703,6 +710,10 @@
config_log_state *cls,
array_header *default_format) {
if (cls->log_fd > 0) return cls; /* virtual config shared w/main server
*/
+
+ if (cls->fname == NULL) {
+ return cls; /* Leave it NULL to decline. */
+ }
if (*cls->fname == '|') {
FILE *dummy;
