3.4.6

diff --git a/ChangeLog b/ChangeLog
index d1a264ea9954bf00fc5c6ceeb01576e8efebf9a2..0f41cace350ee3c260b1787292f382973fefa27d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-3.4.6 (25 Jun 2014):
+
+       - Regression: segmentation fault logging with %tg format specifier
+       - Bug 4065: round-robin neighbor selection with unequal weights
+       - Bug 4056: assertion MemPools[type] from netdbExchangeStart()
+       - Bug 4050: segmentation fault in CommSelectEngine::checkEvents on helper response
+       - Fix segmentation fault setting up server SSL connnection
+       - Fix hanging Non-HTTPS connections on SSL-bump enabled port
+       - Fix Cache Manager actions listed more than once
+       - ... and many minor memory leaks
+       - ... and several portability build issues
+       - ... and some documentation updates
+
 Changes to squid-3.4.5 (02 May 2014):
 
        - Regression Bug 4051: inverted test on CONNECT payload existence

diff --git a/configure.ac b/configure.ac
index 573c4f07e636fdad8d7736e9f54ffb0b7e985ca1..f0297cefde615a972595c21b95413c06d9e5e72d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Squid Web Proxy],[3.4.5-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.4.6-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.4.sgml b/doc/release-notes/release-3.4.sgml
index cd2310070b156e2f10f5682e6c8b36899f227fde..fb57eeea0cdaaa59ab007ba88de75847904cdc5e 100644 (file)
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.4.5 release notes</title>
+<title>Squid 3.4.6 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.4.5 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.6 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.4/"> or the
  <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.

diff --git a/src/http/StatusCode.h b/src/http/StatusCode.h
index 904c13e62023aab30ea409f8b2ac3b2f3f07e8df..349b1ed82a3238f2e180852f7533c2084e826a31 100644 (file)
--- a/src/http/StatusCode.h
+++ b/src/http/StatusCode.h
@@ -31,7 +31,7 @@ typedef enum {
     scNotModified = 304,
     scUseProxy = 305,
     scTemporaryRedirect = 307,
-    scPermanentRedirect = 308, /**< RFC-reschke-http-status-308-07 */
+    scPermanentRedirect = 308, /**< RFC7238 */
     scBadRequest = 400,
     scUnauthorized = 401,
     scPaymentRequired = 402,

diff --git a/src/main.cc b/src/main.cc
index 59825577c64cfa8271e6add7fc20051751bc407d..c3c555166150e4b868d689c8ae08eb4281f43bc8 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -296,7 +296,11 @@ usage(void)
 #if USE_WIN32_SERVICE
             "       -i        Installs as a Windows Service (see -n option).\n"
 #endif
-            "       -k reconfigure|rotate|shutdown|interrupt|kill|debug|check|parse\n"
+            "       -k reconfigure|rotate|shutdown|"
+#ifdef SIGTTIN
+            "restart|"
+#endif
+            "interrupt|kill|debug|check|parse\n"
             "                 Parse configuration file, then send signal to \n"
             "                 running copy (except -k parse) and exit.\n"
 #if USE_WIN32_SERVICE