Restore default value of access_log like it has always been

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 5c2c839093a7c8ed7cd5e3bea0f668c57883376f..afb31adad45be41cd9b8a0a9c6e33265bfa30c67 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.445 2003/07/06 21:50:55 hno Exp $
+ * $Id: cache_cf.cc,v 1.446 2003/07/16 12:54:42 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -70,6 +70,8 @@ static void parse_cachedir_option_maxsize(SwapDir * sd, const char *option, cons
 static void dump_cachedir_option_maxsize(StoreEntry * e, const char *option, SwapDir const * sd);
 static void parse_logformat(logformat ** logformat_definitions);
 static void parse_access_log(customlog ** customlog_definitions);
+static int check_null_access_log(customlog *customlog_definitions);
+
 static void dump_logformat(StoreEntry * entry, const char *name, logformat * definitions);
 static void dump_access_log(StoreEntry * entry, const char *name, customlog * definitions);
 static void free_logformat(logformat ** definitions);
@@ -3182,6 +3184,12 @@ done:
     *logs = cl;
 }
 
+static int
+check_null_access_log(customlog *customlog_definitions)
+{
+    return customlog_definitions == NULL;
+}
+
 static void
 dump_logformat(StoreEntry * entry, const char *name, logformat * definitions)
 {

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 17f4bcd31b5eb212b248fc0abd250be1c9bfa340..5fcd4c87982026a9527d28c9dd11cee55cb50456 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.332 2003/07/10 15:55:22 hno Exp $
+# $Id: cf.data.pre,v 1.333 2003/07/16 12:54:42 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1150,21 +1150,19 @@ NAME: access_log cache_access_log
 TYPE: access_log
 LOC: Config.Log.accesslogs
 DEFAULT: none
+DEFAULT_IF_NONE: @DEFAULT_ACCESS_LOG@
 DOC_START
        These files log client request activities. Has a line every HTTP or
        ICP request. The format is:
        access_log <filepath> [<logformat name> [acl acl ...]]
+       access_log none [acl acl ...]]
 
        Will log to the specified file using the specified format (which
        must be defined in a logformat directive) those entries which match
        ALL the acl's specified (which must be defined in acl clauses).
        If no acl is specified, all requests will be logged to this file.
        
-       To disable logging of a request use the filepath "none", in which
-       case a logformat name should not be specified.
-NOCOMMENT_START
-access_log @DEFAULT_ACCESS_LOG@ squid
-NOCOMMENT_END
+       To disable logging of a request specify "none".
 DOC_END