3.5.8

diff --git a/ChangeLog b/ChangeLog
index affee9d18fe857961c7817662e49c2283a385a35..6bd3c1a2fb86e96e73b0696eed855a7b9092e9bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Changes to squid-3.5.8 (02 Sep 2015):
+
+       - Regression Bug 4306: build portability fix in Kerberos helpers
+       - Bug 4302: IPFilter v5 transparent interception
+       - Bug 4301: compile errors with IPFilter interception
+       - Bug 4285 partial: %us is not supported in access.log
+       - Bug 4278: Docs: typo in the refresh_pattern freshness algorithm
+       - Bug 4242: compile errors with eCAP using clang-3.6
+       - Bug 3696: crash when client delay pools are activated
+       - Bug 3553: cache_swap_high ignored and maxCapacity used instead
+       - Regression Fix: FtpServer.cc:1024: "reply != NULL" assertion
+       - Fix ignore of impossible SSL bumping actions, as intended and documented
+       - Fix memory leak in Surrogate-Capability header detection
+       - Fix truncated body length when RESPMOD service aborts
+       - Reject non-chunked HTTP messages with conflicting Content-Length values
+       - Support splice for SSLv3 and TLSv1 sessions that start with an SSLv2 Hello
+       - ... and several portability and compile fixes
+       - ... and several documentation updates
+
 Changes to squid-3.5.7 (01 Aug 2015):
 
        - Bug 4293: wrong SNI sent to server after URL-rewrite

diff --git a/configure.ac b/configure.ac
index c36730fa047f444d07f0f887b966bf1bd43e9d0c..f6bd7900cea2914649de7abf90dfd18fb8a75f56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[3.5.7-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.5.8-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index e393b959285e2eb1deee8229c9760f33c4706e00..89841c6f8c889758906e03f97d4f26e36e421777 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.5.7 release notes</title>
+<title>Squid 3.5.8 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.5.7.
+The Squid Team are pleased to announce the release of Squid-3.5.8.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index c922aa37548b2010738b06b2d993c502e9e1738f..36d2ecbee707535249c2c5d5eec9601fb0140f01 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -901,15 +901,17 @@ DOC_START
        acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
 
        acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
-         # The arp ACL requires the special configure option --enable-arp-acl.
-         # Furthermore, the ARP ACL code is not portable to all operating systems.
-         # It works on Linux, Solaris, Windows, FreeBSD, and some
-         # other *BSD variants.
          # [fast]
+         # The 'arp' ACL code is not portable to all operating systems.
+         # It works on Linux, Solaris, Windows, FreeBSD, and some other
+         # BSD variants.
          #
-         # NOTE: Squid can only determine the MAC address for clients that are on
-         # the same subnet. If the client is on a different subnet,
-         # then Squid cannot find out its MAC address.
+         # NOTE: Squid can only determine the MAC/EUI address for IPv4
+         # clients that are on the same subnet. If the client is on a
+         # different subnet, then Squid cannot find out its address.
+         #
+         # NOTE 2: IPv6 protocol does not contain ARP. MAC/EUI is either
+         # encoded directly in the IPv6 address or not available.
 
        acl aclname srcdomain   .foo.com ...
          # reverse lookup, from client IP [slow]
@@ -2502,7 +2504,8 @@ DEFAULT: none
 LOC: Config.ssl_client.options
 TYPE: string
 DOC_START
-       SSL implementation options to use when proxying https:// URLs
+       Colon (:) or comma (,) separated list of SSL implementation options
+       to use when proxying https:// URLs
        
        The most important being:
 
@@ -2524,6 +2527,9 @@ DOC_START
        
        See the OpenSSL SSL_CTX_set_options documentation for a
        complete list of possible options.
+       
+       WARNING: This directive takes a single token. If a space is used
+                the value(s) after that space are SILENTLY IGNORED.
 DOC_END
 
 NAME: sslproxy_cipher