Prep for 3.1.21 and 3.2 release notes

diff --git a/ChangeLog b/ChangeLog
index 62aa30cd87da40dc0b1aa6eef927054263f553d7..aa4f31e2ed0966a3a7b44b5d8d075c5ce1326655 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -405,6 +405,24 @@ Changes to squid-3.2.0.1 (03 Aug 2010):
        - ... and a great many testing improvements
        - ... and many documentation updates
 
+Changes to squid-3.1.21 (23 Sep 2012):
+
+       - Bug 3622: peerClearRRStart scheduling multiple events
+       - Bug 3615: configure check for default max number of FDs is broken
+       - Bug 3607: --enable-auth documented default action incorrect
+       - Bug 3593: socket failure: Address family not supported by protocol
+       - Bug 3584: Detection of setresuid() is broken
+       - Bug 3568: Consolidate external_acl_type config dumping and add missing %%
+       - Bug 3564: eCAP not supporting CoAP URI schemes
+       - Bug 3484: Docs: sslproxy_cert_error example flawed
+       - Bug 3462: Delay Pools and ICAP
+       - Bug 3133: better fix: Memory leak handling requests for sites that don't exist
+       - Bug 2976: ERR_INVALID_URL for transparently captured requests when reconfiguring
+       - Silence IOS 15.1 unknown capabilities messages.
+       - Account for Store disk client quota when bandwidth-limiting the server.
+       - ... and several documentation fixes
+       - ... and several compile fixes
+
 Changes to squid-3.1.20 (08 Jun 2012):
 
        - Regression Bug 3545: FreeBSD dnsserver segfaults

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index def62067bc0e917a4e40faa68db33b3b2065f35c..41ba10edb12f91afc64fc0a2cd1ed40a7e22ec67 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.20 release notes</title>
+<title>Squid 3.1.21 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.1.20
+The Squid Team are pleased to announce the release of Squid-3.1.21
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
 
@@ -899,9 +899,13 @@ logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size
         RFC2475, and RFC3260.
 
         The TOS/DSCP byte must be exactly that - octet value 0x00-0xFF.
-        Note that in practice often only values up to 0x3F are usable
-        as the two highest bits have been redefined for use by ECN
-        (RFC3168).
+        Note that in practice often only multiples of 4 is usable as the
+        two rightmost bits have been redefined for use by ECN (RFC 3168
+        section 23.1).
+
+        Note that in practice often only values up to 0xFC are usable,
+        and only in multiple of 4, as the two rightmost bits have been
+        redefined for use by ECN (RFC3168).
 
         This setting is configured by setting the source TOS values:
 

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 90e9e8d61ee2d077ef0b708a5ec6c6db83ec14a3..fcb0a576330800618385c185a508bafe68768e13 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -293,7 +293,7 @@ Most user-facing changes are reflected in squid.conf (see below).
 <p>The man(8) and man(1) pages bundled with Squid are now provided online for all
    versions and beginning with 3.2 they are available in languages other than English (where translated).
 
-<p>Details in <url url="http://wiki.squid-cache.org/Features/QualityOfService" name="The Squid wiki">
+<p>Details in <url url="http://wiki.squid-cache.org/Translations" name="The Squid wiki">
 
 <p>3.1 began the Internationalization of Squid with the public facing error pages.
    This move begins the Localization of the internal administrator facing manuals.
@@ -341,7 +341,8 @@ Most user-facing changes are reflected in squid.conf (see below).
   direct filesystem logging (stdio, daemon) to network logging (syslog, UDP and TCP). The daemon logging
   interface allows for a custom helper to be written to process logs in real-time.
 
-<p>Upgrading: the <em>access_log</em> was previously logged via what is now called the <em>stdio</em> module.
+<p>Upgrading: the <em>access_log</em> and <em>cache_store_log</em> were previously logged via what is
+  now called the <em>stdio</em> module.
   This is still supported and used by default if no module is named. For best performance particularly in SMP
   environments we recommend the <em>daemon</em> be used. The provided <em>log_file_daemon</em> helper
   performs the traditional logging to local filesystem.
@@ -353,8 +354,8 @@ Most user-facing changes are reflected in squid.conf (see below).
   logging a single cache.log at relatively high debug levels on a high-traffic system. Or one which is
   required to store a long period of access.log and needs to conserve disk space.
 
-<p>The referer_log and useragent_log directives have been converted to built-in log formats.
-  These logs are now created using an access_log line with the format "referrer" or "useragent".
+<p>The <em>referer_log</em> and <em>useragent_log</em> directives have been converted to built-in log formats.
+  These logs are now created using an <em>access_log</em> line with the format "referrer" or "useragent".
   They also now log all client requests, if there was no Referer or User-Agent header a dash (-) is logged.
 
 <p>Known Issue: The TCP logging module does not recover from broken connections well.
@@ -610,6 +611,10 @@ This section gives a thorough account of those changes in three categories:
        <p><em>htcp-*</em> options collapsed into <em>htcp=</em> taking an optional comma-separated list of flags.
           The old form is deprecated but still accepted.
 
+       <tag>cache_store_log</tag>
+       <p>Now uses logging modules. Example: stdio:/file/path
+          see <em>access_log</em> for a list of supported modules and their parameters.
+
        <tag>clientside_mark</tag>
        <p>New configuration parameter <em>clientside_mark</em>
        <p>Allows packets leaving Squid on the client side to be marked with a Netfilter mark value in the same way as the existing clientside_tos feature.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 23187c537e370c187319f159ad1186e8a1f6aa78..540aecdc7881fd8b8f6f6de708e115b543ea7a51 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -3357,12 +3357,16 @@ LOC: Config.Log.store
 DOC_START
        Logs the activities of the storage manager.  Shows which
        objects are ejected from the cache, and which objects are
-       saved and for how long.  To disable, enter "none" or remove the line.
+       saved and for how long.
        There are not really utilities to analyze this data, so you can safely
-       disable it.
-
+       disable it (the default).
+       
+       Store log uses modular logging outputs. See access_log for the list
+       of modules supported.
+       
        Example:
-               cache_store_log @DEFAULT_STORE_LOG@
+               cache_store_log stdio:@DEFAULT_STORE_LOG@
+               cache_store_log daemon:@DEFAULT_STORE_LOG@
 DOC_END
 
 NAME: cache_swap_state cache_swap_log