Various Documentation updates

diff --git a/doc/release-notes/release-3.0.sgml b/doc/release-notes/release-3.0.sgml
index 6a2775f98e8ab16c1d6fe87b35aea3e01c2e372f..bd5d0539aac454e6fc03d90b925dee061049c7a8 100644 (file)
--- a/doc/release-notes/release-3.0.sgml
+++ b/doc/release-notes/release-3.0.sgml
@@ -23,7 +23,7 @@ We welcome feedback and bug reports. If you find a bug, please see <url url="htt
 
 <sect>Known issues
 <p>
-Although this release is deemed good enough for use in many setups, please note the existence of <url url="http://www.squid-cache.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;target_milestone=3.0&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=bugs.bug_severity&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" name="open bugs against Squid-3.0">.
+Although this release is deemed good enough for use in many setups, please note the existence of <url url="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;target_milestone=3.0&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=bugs.bug_severity&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" name="open bugs against Squid-3.0">.
 
 <sect>Changes since earlier STABLE releases of Squid-3.0
 <p>
@@ -158,8 +158,8 @@ In the following example the command line of the "squidsvc" Squid service is set
 <tag>PSAPI.DLL (Process Status Helper) Considerations</tag>
 
 The process status helper functions make it easier for you to obtain information about
-processes and device drivers running on Microsoft® Windows NT®/Windows® 2000. These
-functions are available in PSAPI.DLL, which is distributed in the Microsoft® Platform
+processes and device drivers running on Microsoft? Windows NT?/Windows? 2000. These
+functions are available in PSAPI.DLL, which is distributed in the Microsoft? Platform
 Software Development Kit (SDK). The same information is generally available through the
 performance data in the registry, but it is more difficult to get to it. PSAPI.DLL is
 freely redistributable.

diff --git a/scripts/www/build-cfg-help.pl b/scripts/www/build-cfg-help.pl
index 06c53a65c85d6cd114f1dab69ffe022a8a663796..caefc1a2242adfadcd5431f373f5253f9ca43c1e 100755 (executable)
--- a/scripts/www/build-cfg-help.pl
+++ b/scripts/www/build-cfg-help.pl
@@ -20,6 +20,7 @@ use File::Basename;
 # IFDEF: <the ifdef bit>
 # TYPE: <the config type>
 # DEFAULT: <the default value>
+# DEFAULT_IF_NONE: <alternative default value>
 # LOC: <location in the Config struct>
 # DOC_START
 #   documentation goes here
@@ -252,6 +253,8 @@ while (<>) {
                } else {
                    $data->{"default"} = "$name $1";
                }
+       } elsif ($_ =~ /^DEFAULT_IF_NONE: (.*)$/) {
+               $data->{"default"} = "$name $1";
        } elsif ($_ =~ /^LOC:(.*)$/) {
                $data->{"loc"} = $1;
                $data->{"loc"} =~ s/^[\s\t]*//;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index eceec7d338bd416bda735327bc0b23f8a943f62b..55b82219b5754b47164d9dba4f76faa4f651d5e8 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -724,7 +724,6 @@ NAME: follow_x_forwarded_for
 TYPE: acl_access
 IFDEF: FOLLOW_X_FORWARDED_FOR
 LOC: Config.accessList.followXFF
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        Allowing or Denying the X-Forwarded-For header to be followed to
@@ -811,7 +810,6 @@ DOC_END
 NAME: http_access
 TYPE: acl_access
 LOC: Config.accessList.http
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        Allowing or Denying access based on defined access lists
@@ -906,7 +904,6 @@ DOC_END
 NAME: icp_access
 TYPE: acl_access
 LOC: Config.accessList.icp
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        Allowing or Denying access to the ICP port based on defined
@@ -928,7 +925,6 @@ NAME: htcp_access
 IFDEF: USE_HTCP
 TYPE: acl_access
 LOC: Config.accessList.htcp
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        Allowing or Denying access to the HTCP port based on defined
@@ -954,7 +950,6 @@ NAME: htcp_clr_access
 IFDEF: USE_HTCP
 TYPE: acl_access
 LOC: Config.accessList.htcp_clr
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        Allowing or Denying access to purge content using HTCP based
@@ -997,7 +992,6 @@ DOC_END
 NAME: ident_lookup_access
 TYPE: acl_access
 IFDEF: USE_IDENT
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 LOC: Ident::TheConfig.identLookup
 DOC_START
@@ -2536,7 +2530,6 @@ DOC_END
 NAME: access_log cache_access_log
 TYPE: access_log
 LOC: Config.Log.accesslogs
-DEFAULT: none
 DEFAULT_IF_NONE: @DEFAULT_ACCESS_LOG@ squid
 DOC_START
        These files log client request activities. Has a line every HTTP or
@@ -2896,7 +2889,6 @@ COMMENT_END
 
 NAME: cache_log
 TYPE: string
-DEFAULT: none
 DEFAULT_IF_NONE: @DEFAULT_CACHE_LOG@
 LOC: Debug::cache_log
 DOC_START
@@ -2927,7 +2919,6 @@ DOC_END
 NAME: coredump_dir
 TYPE: string
 LOC: Config.coredump_dir
-DEFAULT: none
 DEFAULT_IF_NONE: none
 DOC_START
        By default Squid leaves core files in the directory from where
@@ -4565,7 +4556,6 @@ DOC_END
 NAME: wccp2_service
 TYPE: wccp2_service
 LOC: Config.Wccp2.info
-DEFAULT: none
 DEFAULT_IF_NONE: standard 0
 IFDEF: USE_WCCPv2
 DOC_START
@@ -4794,7 +4784,6 @@ DOC_END
 NAME: snmp_access
 TYPE: acl_access
 LOC: Config.accessList.snmp
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 IFDEF: SQUID_SNMP
 DOC_START
@@ -6067,7 +6056,6 @@ NAME: icap_retry
 TYPE: acl_access
 IFDEF: ICAP_CLIENT
 LOC: Adaptation::Icap::TheConfig.repeat
-DEFAULT: none
 DEFAULT_IF_NONE: deny all
 DOC_START
        This ACL determines which retriable ICAP transactions are
@@ -6517,7 +6505,6 @@ NAME: as_whois_server
 TYPE: string
 LOC: Config.as_whois_server
 DEFAULT: whois.ra.net
-DEFAULT_IF_NONE: whois.ra.net
 DOC_START
        WHOIS server to query for AS numbers.  NOTE: AS numbers are
        queried only when Squid starts up, not for every request.

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index dceac5afe8ffbed6a3506ce8c6cfa6652d2c3c9b..78dd9a9aa3312c07cec6c86cd85f2890b4017ccf 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -557,27 +557,25 @@ gen_default(Entry * head, FILE * fp)
             continue;
         }
 
-        if (entry->default_value == NULL) {
+        if (entry->default_value == NULL && entry->default_if_none == NULL) {
             fprintf(stderr, "NO DEFAULT FOR %s\n", entry->name);
             rc |= 1;
             continue;
         }
 
-        assert(entry->default_value);
-
-        if (entry->ifdef)
-            fprintf(fp, "#if %s\n", entry->ifdef);
-
-        if (strcmp(entry->default_value, "none") == 0) {
+        if (entry->default_value == NULL || strcmp(entry->default_value, "none") == 0) {
             fprintf(fp, "\t/* No default for %s */\n", entry->name);
         } else {
+            if (entry->ifdef)
+                fprintf(fp, "#if %s\n", entry->ifdef);
+
             fprintf(fp, "\tdefault_line(\"%s %s\");\n",
                     entry->name,
                     entry->default_value);
-        }
 
-        if (entry->ifdef)
-            fprintf(fp, "#endif\n");
+            if (entry->ifdef)
+                fprintf(fp, "#endif\n");
+        }
     }
 
     fprintf(fp, "\tcfg_filename = NULL;\n");