From 29ff6eecce1f5d082896ceee5d6161294cf65bf2 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 18 Jun 2011 20:58:35 +1200 Subject: [PATCH] Prep for 3.1.12.3 --- ChangeLog | 13 +++++++++++++ doc/release-notes/release-3.1.html | 25 ++++++++++++++++--------- doc/release-notes/release-3.1.sgml | 18 +++++++++++------- src/acl/RegexData.cc | 5 +++++ 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d0bfe9dba..77ad107873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Changes to squid-3.1.12.3 (18 Jun 2011): + + - Bug 3236: Port of %oa, % - Squid 3.1.12.1 release notes + Squid 3.1.12.3 release notes -

Squid 3.1.12.1 release notes

+

Squid 3.1.12.3 release notes

Squid Developers

@@ -71,7 +71,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.1.12.1

+

The Squid Team are pleased to announce the release of Squid-3.1.12.3

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

@@ -308,7 +308,7 @@ or the err_page_stylesheet option in squid.conf.

Details in -The Squid wiki

+The Squid wiki

Squid 3.1 includes the much asked for Connection Pinning feature from Squid 2.6.

@@ -1269,6 +1269,9 @@ contained in the directory it points at. If absent, error page localization will
debug_options rotate=

New parameter rotate=N to control number of cache.log rotations independent of other logs.

+
deny_info
+

Support 307 status for redirecting CONNECT tunnels with HTTPS traffic.

+
external_acl_type

New options 'ipv4' and 'ipv6' are added to set the IPv4/v6 protocol between Squid and its helpers. Please be aware of some limits to these options. These options only affet the transport protocol used @@ -1406,10 +1409,12 @@ For now option 'tproxy' remains with old behaviour meaning fully-invisible proxy

No longer controls cache.log rotation. Use debug_options rotate=N instead.

logformat
-

New log format tag sets %icap::* %adapt::* for adaptation information. -%Hs tag deprecated and replaced by request/reply specific >Hs and <Hs -new %>ha option to log HTTP request headers after adaptation and redirection. -HTTP request/reply format tags may now be optionally prefixed with http::. +

New log format tag sets %icap::* %adapt::* for adaptation information.

+

%Hs tag deprecated and replaced by request/reply specific >Hs and <Hs

+

New %<la Local IP address of the last server or peer connection. Ported from 2.7 where it is called %oa.

+

New %<lp Local port number of the last server or peer connection.

+

New %>ha to log HTTP request headers after adaptation and redirection.

+

HTTP request/reply format tags may now be optionally prefixed with http::. Old forms will be deprecated in some as yet undecided future release. 

                 dt              Total time spent making DNS lookups (milliseconds)
@@ -1769,6 +1774,9 @@ Use --without-pthreads to disable, but only if you really have to.

 
incoming_rate

 
Obsolete.

 
+
logformat

+
%oa tag replaced by %<la

+
 
redirector_bypass

 
Replaced by url_rewrite_bypass

 
@@ -1946,7 +1954,6 @@ Use --without-pthreads to disable, but only if you really have to.

 
Not yet ported from 2.7.

 
 
logformat

-
%oa tag not yet ported from 2.7

 
%sn tag not yet ported from 2.7

 
 
max_stale

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index ba96e18be1..d118340551 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 
 

-Squid 3.1.12.2 release notes
+Squid 3.1.12.3 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.1.12.2
+The Squid Team are pleased to announce the release of Squid-3.1.12.3
 
 This new release is available for download from  or the .
 
@@ -231,7 +231,7 @@ Updates can be downloaded from 
+
Details in 
 
 
Squid 3.1 includes the much asked for Connection Pinning feature from Squid 2.6.
 
@@ -1227,9 +1227,11 @@ NOCOMMENT_START
 
 	logformat
 	
New log format tag sets %icap::* %adapt::* for adaptation information.
-	   %Hs tag deprecated and replaced by request/reply specific >Hs and <Hs
-	   new %>ha option to log HTTP request headers after adaptation and redirection.
-	   HTTP request/reply format tags may now be optionally prefixed with http::.
+	
%Hs tag deprecated and replaced by request/reply specific >Hs and <Hs
+	
New %<la Local IP address of the last server or peer connection. Ported from 2.7 where it is called %oa.
+	
New %<lp Local port number of the last server or peer connection.
+	
New %>ha to log HTTP request headers after adaptation and redirection.
+	
HTTP request/reply format tags may now be optionally prefixed with http::.
 	   Old forms will be deprecated in some as yet undecided future release.
 	
 		dt		Total time spent making DNS lookups (milliseconds)
@@ -1565,6 +1567,9 @@ This section gives an account of those changes in three categories:
 	incoming_rate
 	
Obsolete.
 
+	logformat
+	
%oa tag replaced by %<la
+
 	redirector_bypass
 	
Replaced by url_rewrite_bypass
 
@@ -1733,7 +1738,6 @@ This section gives an account of those changes in three categories:
 	
Not yet ported from 2.7.
 
 	logformat
-	
%oa tag not yet ported from 2.7
 	
%sn tag not yet ported from 2.7
 
 	max_stale
diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 85ae0e39fd..b52bbfa4ae 100644
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -134,8 +134,13 @@ aclParseRegexList(relist **curlist)
     int errcode;
     int flags = REG_EXTENDED | REG_NOSUB;
 
+    debugs(28,5, HERE << "Regex new line.");
+
     for (Tail = (relist **)curlist; *Tail; Tail = &((*Tail)->next));
     while ((t = ConfigParser::strtokFile())) {
+
+        debugs(28,5, HERE << "Regex token: " << t);
+
         if (strcmp(t, "-i") == 0) {
             flags |= REG_ICASE;
             continue;
-- 
2.47.2