From 08bb741d3d3860c4cceaf8b975ae30a043c4cc0b Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 6 Mar 2012 19:41:56 -0700 Subject: [PATCH] 3.2.0.16 --- ChangeLog | 18 ++++++++++++++++++ configure.ac | 2 +- doc/release-notes/release-3.2.html | 17 +++++++++-------- doc/release-notes/release-3.2.sgml | 13 +++++++------ src/BodyPipe.cc | 2 +- src/store_dir.cc | 3 +-- 6 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a9c1113f9..93e749194e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Changes to squid-3.2.0.16 (07 Mar 2011): + + - Bug 3508: Correct DNS timeout handling. + - Bug 3503: DNS PTR queries timeout due to wrong QIDs. + - Bug 3497: Bad ssl_crtd db size file causes infinite loop + - Bug 3490: part 1: SegFault opening FTP active data connections + - Bug 3490: Crash writing Apache Common and Referer/Useragent logs + - Bug 3458: Icon Serving (squid-internal-static) Broken + - Bug 3457: Display TLS error details in ERR_SECURE_CONNECT_FAIL + - Bug 3381: 32-bit overflow assertion in StatHist + - Bug 3324: loadFromFile: parse error while reading template file + - Support sslpassword_program for ssl-bump HTTP ports + - Support CoAP protocol coap:// and coaps:// URL schemes in HTTP requests + - Retry requests that failed due to a persistent connection race + - Log '-' on requests with no Referer or User-Agent headers + - ... and several fixes related to in-transit object performance + - ... and some structural design changes for portability + Changes to squid-3.2.0.15 (06 Feb 2011): - Bug 3472: segfault with the message 'urlParse: URL too large' diff --git a/configure.ac b/configure.ac index 9b417b7585..d8a58e3ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl $Id$ dnl dnl dnl -AC_INIT([Squid Web Proxy],[3.2.0.15-BZR],[http://www.squid-cache.org/bugs/],[squid]) +AC_INIT([Squid Web Proxy],[3.2.0.16-BZR],[http://www.squid-cache.org/bugs/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff --git a/doc/release-notes/release-3.2.html b/doc/release-notes/release-3.2.html index 5e745dd31e..0735c8f6a9 100644 --- a/doc/release-notes/release-3.2.html +++ b/doc/release-notes/release-3.2.html @@ -2,10 +2,10 @@ - Squid 3.2.0.15 release notes + Squid 3.2.0.16 release notes -

Squid 3.2.0.15 release notes

+

Squid 3.2.0.16 release notes

Squid Developers


@@ -72,7 +72,7 @@ for Applied Network Research and members of the Web Caching community.

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.2.0.15 for testing.

+

The Squid Team are pleased to announce the release of Squid-3.2.0.16 for testing.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.2/ or the mirrors.

@@ -404,7 +404,7 @@ is required to prevent an unacceptable surrogate ID of 'localhost' being generat 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.

-

Upgrading: the access_log was previously logge via what is now called the stdio module. +

Upgrading: the access_log was previously logged via what is now called the stdio module. This is still supported and used by default if no module is named. For best performance particularly in SMP environments we recommend the daemon be used. The provided log_file_daemon helper performs the traditional logging to local filesystem.

@@ -417,7 +417,8 @@ logging a single cache.log at relatively high debug levels on a high-traffic sys required to store a long period of access.log and needs to conserve disk space.

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".

+These logs are now created using an access_log 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.

2.10 Client Bandwidth Limits @@ -689,9 +690,6 @@ The old form is deprecated but still accepted.

3xx status only available when redirecting to a URI. Other status only available when supplying an error template body.

-
dns_v4_fallback
-

Obsoleted by DNS parallel lookups.

-
external_acl_type

New format tags and option parameters:

%SRCEUI48 EUI-48 / MAC address of client from ARP lookup.

@@ -791,6 +789,9 @@ The IPv6 magic 'to_ipv6' hacks needed in 3.1 are now no longer necessary.

+
dns_v4_fallback
+

Obsolete. Replaced by DNS parallel lookups.

+
emulate_httpd_log

Replaced by common format option on an access_log directive.

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml index 324c674fee..74f4ba3aaa 100644 --- a/doc/release-notes/release-3.2.sgml +++ b/doc/release-notes/release-3.2.sgml @@ -1,6 +1,6 @@
-Squid 3.2.0.15 release notes +Squid 3.2.0.16 release notes Squid Developers @@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community. Notice

-The Squid Team are pleased to announce the release of Squid-3.2.0.15 for testing. +The Squid Team are pleased to announce the release of Squid-3.2.0.16 for testing. This new release is available for download from or the . @@ -311,7 +311,7 @@ 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. -

Upgrading: the access_log was previously logge via what is now called the stdio module. +

Upgrading: the access_log was previously logged via what is now called the stdio module. This is still supported and used by default if no module is named. For best performance particularly in SMP environments we recommend the daemon be used. The provided log_file_daemon helper performs the traditional logging to local filesystem. @@ -325,6 +325,7 @@ Most user-facing changes are reflected in squid.conf (see below).

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". + They also now log all client requests, if there was no Referer or User-Agent header a dash (-) is logged. Client Bandwidth Limits @@ -575,9 +576,6 @@ This section gives a thorough account of those changes in three categories: 3xx status only available when redirecting to a URI. Other status only available when supplying an error template body. - dns_v4_fallback -

Obsoleted by DNS parallel lookups. - external_acl_type

New format tags and option parameters:

%SRCEUI48 EUI-48 / MAC address of client from ARP lookup. @@ -673,6 +671,9 @@ This section gives a thorough account of those changes in three categories: Removed tags

+ dns_v4_fallback +

Obsolete. Replaced by DNS parallel lookups. + emulate_httpd_log

Replaced by common format option on an access_log directive. diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index 3cdefe3d16..600317b4ef 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -277,7 +277,7 @@ BodyPipe::expectNoConsumption() if (!abortedConsumption && !exhausted()) { // Before we abort, any regular consumption should be over and auto - // consumption must not be started. + // consumption must not be started. Must(!theConsumer); AsyncCall::Pointer call= asyncCall(91, 7, diff --git a/src/store_dir.cc b/src/store_dir.cc index 2d503c84b9..93f3f94380 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -791,8 +791,7 @@ StoreController::handleIdleEntry(StoreEntry &e) // have a dedicated storage for them (that would not purge them). // They are not managed [well] by any specific Store handled below. keepInLocalMemory = true; - } else - if (memStore) { + } else if (memStore) { memStore->considerKeeping(e); // leave keepInLocalMemory false; memStore maintains its own cache } else { -- 2.47.2