diff -u -r squid-3.0.STABLE3/ChangeLog squid-3.0.STABLE4/ChangeLog --- squid-3.0.STABLE3/ChangeLog 2008-03-31 18:20:18.000000000 +1200 +++ squid-3.0.STABLE4/ChangeLog 2008-04-01 23:54:25.000000000 +1200 @@ -1,3 +1,7 @@ +Changes to squid-3.0.STABLE4 (2 Apr 2008): + + - Bug 2288: compile error slipped into STABLE3. + Changes to squid-3.0.STABLE3 (31 Mar 2008): - Improved HTTP 1.1 support. diff -u -r squid-3.0.STABLE3/configure squid-3.0.STABLE4/configure --- squid-3.0.STABLE3/configure 2008-03-31 18:20:29.000000000 +1200 +++ squid-3.0.STABLE4/configure 2008-04-01 23:54:39.000000000 +1200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.488.2.3 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.0.STABLE3. +# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.0.STABLE4. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.0.STABLE3' -PACKAGE_STRING='Squid Web Proxy 3.0.STABLE3' +PACKAGE_VERSION='3.0.STABLE4' +PACKAGE_STRING='Squid Web Proxy 3.0.STABLE4' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' ac_unique_file="src/main.cc" @@ -1507,7 +1507,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 3.0.STABLE3 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.0.STABLE4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE3:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE4:";; esac cat <<\_ACEOF @@ -1886,7 +1886,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.0.STABLE3 +Squid Web Proxy configure 3.0.STABLE4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1900,7 +1900,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 3.0.STABLE3, which was +It was created by Squid Web Proxy $as_me 3.0.STABLE4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2574,7 +2574,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.0.STABLE3' + VERSION='3.0.STABLE4' cat >>confdefs.h <<_ACEOF @@ -45406,7 +45406,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 3.0.STABLE3, which was +This file was extended by Squid Web Proxy $as_me 3.0.STABLE4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -45459,7 +45459,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Squid Web Proxy config.status 3.0.STABLE3 +Squid Web Proxy config.status 3.0.STABLE4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -u -r squid-3.0.STABLE3/configure.in squid-3.0.STABLE4/configure.in --- squid-3.0.STABLE3/configure.in 2008-03-31 18:20:29.000000000 +1200 +++ squid-3.0.STABLE4/configure.in 2008-04-01 23:54:39.000000000 +1200 @@ -5,7 +5,7 @@ dnl dnl dnl -AC_INIT(Squid Web Proxy, 3.0.STABLE3, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 3.0.STABLE4, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) diff -u -r squid-3.0.STABLE3/include/version.h squid-3.0.STABLE4/include/version.h --- squid-3.0.STABLE3/include/version.h 2008-03-31 18:20:29.000000000 +1200 +++ squid-3.0.STABLE4/include/version.h 2008-04-01 23:54:39.000000000 +1200 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1206944412 +#define SQUID_RELEASE_TIME 1207050858 #endif diff -u -r squid-3.0.STABLE3/RELEASENOTES.html squid-3.0.STABLE4/RELEASENOTES.html --- squid-3.0.STABLE3/RELEASENOTES.html 2008-03-31 18:21:33.000000000 +1200 +++ squid-3.0.STABLE4/RELEASENOTES.html 2008-04-01 23:55:44.000000000 +1200 @@ -2,10 +2,10 @@ - Squid 3.0.STABLE3 release notes + Squid 3.0.STABLE4 release notes -

Squid 3.0.STABLE3 release notes

+

Squid 3.0.STABLE4 release notes

Squid Developers

$Id: release-3.0.sgml,v 1.30.2.5 2008/02/28 00:26:31 amosjeffries Exp $
@@ -15,7 +15,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.0.STABLE3.

+

The Squid Team are pleased to announce the release of Squid-3.0.STABLE4.

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

@@ -116,10 +116,8 @@

The TCP_REFRESH_HIT and TCP_REFRESH_MISS log types have been replaced because they were misleading (all refreshes need to query the origin server, so they could never be hits). The following log types have been introduced to replace them:

-
TCP_REFRESH_UNMODIFIED
-

The requested object was cached but STALE. The IMS query for the object resulted in "304 not modified".

-
TCP_REFRESH_MODIFIED
-

The requested object was cached but STALE. The IMS query returned the new content.

+
TCP_REFRESH_UNMODIFIED

The requested object was cached but STALE. The IMS query for the object resulted in "304 not modified".

+
TCP_REFRESH_MODIFIED

The requested object was cached but STALE. The IMS query returned the new content.

See @@ -152,8 +150,7 @@

-
minimum_icp_query_timeout (msec)
-

+

minimum_icp_query_timeout (msec)

 Default: 5
 
@@ -167,8 +164,7 @@
         
 

-
background_ping_rate
-

+

background_ping_rate

 Default: 10 seconds
 
@@ -178,8 +174,7 @@
 

-
httpd_accel_surrogate_id
-

+

httpd_accel_surrogate_id

 Default: unset
 
@@ -191,8 +186,7 @@
 

-
http_accel_surrogate_remote on|off
-

+

http_accel_surrogate_remote on|off

 Default: off
 
@@ -202,8 +196,7 @@
 

-
esi_parser libxml2|expat|custom
-

+

esi_parser libxml2|expat|custom

 Default: custom
 
@@ -214,8 +207,7 @@
 

-
email_err_data on|off
-

+

email_err_data on|off

 Default: on
 
@@ -227,8 +219,7 @@
 

-
refresh_all_ims on|off
-

+

refresh_all_ims on|off

 Default: off
 
@@ -243,13 +234,10 @@
         
 

-
request_header_access
-

Replaces the header_access directive of Squid-2.6 and earlier, but applies to requests only.

-
reply_header_access
-

Replaces the header_access directive of Squid-2.6 and earlier, but applies to replies only.

+
request_header_access

Replaces the header_access directive of Squid-2.6 and earlier, but applies to requests only.

+
reply_header_access

Replaces the header_access directive of Squid-2.6 and earlier, but applies to replies only.

-
icap_enable on|off
-

+

icap_enable on|off

 Default: off
 
@@ -257,8 +245,7 @@
         
 

-
icap_preview_enable on|off
-

+

icap_preview_enable on|off

 Default: off
 
@@ -267,8 +254,7 @@
         
 

-
icap_preview_size
-

+

icap_preview_size

 Default: -1
 
@@ -278,8 +264,7 @@
         
 

-
icap_default_options_ttl (seconds)
-

+

icap_default_options_ttl (seconds)

 Default: 60
 
@@ -288,8 +273,7 @@
         
 

-
icap_persistent_connections on|off
-

+

icap_persistent_connections on|off

 Default: on
 
@@ -298,8 +282,7 @@
         
 

-
icap_send_client_ip on|off
-

+

icap_send_client_ip on|off

 Default: off
 
@@ -307,8 +290,7 @@
         
 

-
icap_send_client_username on|off
-

+

icap_send_client_username on|off

 Default: off
 
@@ -317,8 +299,7 @@
         
 

-
icap_service
-

+

icap_service

 Default: none
 
@@ -342,8 +323,7 @@
         
 

-
icap_class
-

+

icap_class

 Default: none
 
@@ -358,8 +338,7 @@
         
 

-
icap_access
-

+

icap_access

 Default: none
 
@@ -383,8 +362,7 @@
 

-
accept_filter
-

+

accept_filter

 The name of an accept(2) filter to install on Squid's
 listen socket(s).  This feature is perhaps specific to
@@ -397,8 +375,7 @@
 

-
include
-

New option to import entire secondary configuration files into squid.conf. +

include

New option to import entire secondary configuration files into squid.conf.

         Squid will follow the files immediately and insert all their content
         as if it was at that position in squid.conf. As per squid.conf some
@@ -413,8 +390,7 @@
 

-
acl myportname
-

New acl type myportname, matching the name of the http(s)_port where the request was accepted +

acl myportname

New acl type myportname, matching the name of the http(s)_port where the request was accepted

         acl aclname myportname 3128 ...         # http(s)_port name
         
@@ -429,8 +405,7 @@
 
 

-
http_port
-

New options: +

http_port

New options:

     disable-pmtu-discovery=
       Control Path-MTU discovery usage:
@@ -456,15 +431,13 @@
         
 

-
https_port
-

Removed options: +

https_port

Removed options:

     urlgroup=, not yet ported to Squid-3.
         
 

-
cache_peer
-

New options: +

cache_peer

New options:

      basetime=n
 
@@ -504,8 +477,7 @@
         
 

-
cache_dir
-

Common options +

cache_dir

Common options

     no-store, replaces the older read-only option
 
@@ -528,8 +500,7 @@
         
 

-
auth_param
-

Removed Basic auth option +

auth_param

Removed Basic auth option

     blankpasswor, not yet ported to squid-3.
     auth_param basic concurrency 0
@@ -543,8 +514,7 @@
 

-
external_acl_type
-

New format specifications: +

external_acl_type

New format specifications:

     %URI          Requested URI
 
@@ -568,8 +538,7 @@
 

-
refresh_pattern
-

New options: +

refresh_pattern

New options:

     ignore-no-store
     refresh-ims
@@ -586,8 +555,7 @@
         
 

-
acl
-

New types: +

acl

New types:

     acl aclname http_status 200 301 500- 400-403 ...     # status code in reply
 
@@ -604,16 +572,14 @@
         
 

-
short_icon_urls
-

New default: +

short_icon_urls

New default:

     Default: on
     (Old default: off)
         
 

-
delay_class
-

New delay classes: +

delay_class

New delay classes:

     class 4 Everything in a class 3 delay pool, with an
     additional limit on a per user basis. This
@@ -627,8 +593,7 @@
 

-
htcp_port
-

New default to require the feature to be enabled in squid.conf: +

htcp_port

New default to require the feature to be enabled in squid.conf:

     Default: 0 (disabled)
     (Old default: 4827)
@@ -636,8 +601,7 @@
 

-
icp_port
-

New default to require the feature to be enabled in squid.conf: +

icp_port

New default to require the feature to be enabled in squid.conf:

     Default: 0 (disabled)
     (Old default: 3130)
@@ -645,8 +609,7 @@
 

-
snmp_port
-

New default to require the feature to be enabled in squid.conf: +

snmp_port

New default to require the feature to be enabled in squid.conf:

     Default: 0 (disabled)
     (Old default: 3401)
@@ -654,8 +617,7 @@
 

-
logformat
-

New format tags: +

logformat

New format tags:

     rp      Request URL-Path excluding hostname
 
@@ -677,8 +639,7 @@
 

-
reply_body_max_size
-

Syntax changed: +

reply_body_max_size

Syntax changed:

     reply_body_max_size size [acl acl...]
         
@@ -686,11 +647,9 @@
 

allow/deny no longer used.

-
url_rewrite_program
-

No urlgroup support in either requests or responese

+
url_rewrite_program

No urlgroup support in either requests or responese

-
auth_param
-

fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string. +

auth_param

fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string. This is useful for class 4 Delay Pools in Squid 3.x

@@ -703,32 +662,19 @@

-
broken_vary_encoding
-

Not yet ported to Squid-3.

-
cache_vary
-

Not yet ported to Squid-3.

-
collapsed_forwarding
-

Not yet ported to Squid-3.

-
follow_x_forwarded_for
-

Not yet ported to Squid-3.

-
*_uses_indirect_client
-

Not yet ported to Squid-3.

-
error_map
-

Not yet ported to Squid-3.

-
header_access
-

This has been replaced by request_header_access and reply_header_access

-
http_access2
-

Not yet ported to Squid-3.

-
httpd_accel_no_pmtu_disc
-

Replaced by disable-pmtu-discovery http_port option

-
location_rewrite_*
-

Not yet ported to Squid-3.

-
refresh_stale_hit
-

Not yet ported to Squid-3.

-
umask
-

Not yet ported to Squid-3.

-
wais_relay_*
-

equivalent to cache_peer + cache_peer_access.

+
broken_vary_encoding

Not yet ported to Squid-3.

+
cache_vary

Not yet ported to Squid-3.

+
collapsed_forwarding

Not yet ported to Squid-3.

+
follow_x_forwarded_for

Not yet ported to Squid-3.

+
*_uses_indirect_client

Not yet ported to Squid-3.

+
error_map

Not yet ported to Squid-3.

+
header_access

This has been replaced by request_header_access and reply_header_access

+
http_access2

Not yet ported to Squid-3.

+
httpd_accel_no_pmtu_disc

Replaced by disable-pmtu-discovery http_port option

+
location_rewrite_*

Not yet ported to Squid-3.

+
refresh_stale_hit

Not yet ported to Squid-3.

+
umask

Not yet ported to Squid-3.

+
wais_relay_*

equivalent to cache_peer + cache_peer_access.

@@ -757,33 +703,27 @@

-
--enable-shared[=PKGS]
-

Build shared libraries. The default is to build without.

+
--enable-shared[=PKGS]

Build shared libraries. The default is to build without.

-
--enable-static[=PKGS]
-

Build static libraries. The default is on.

+
--enable-static[=PKGS]

Build static libraries. The default is on.

-
--enable-fast-install[=PKGS]
-

+

--enable-fast-install[=PKGS]

 Optimize for fast installation
         default: yes
 

-
--disable-libtool-lock
-

Avoid locking (might break parallel builds)

+
--disable-libtool-lock

Avoid locking (might break parallel builds)

-
--disable-optimizations
-

Don't compile Squid with compiler optimizations enabled. +

--disable-optimizations

Don't compile Squid with compiler optimizations enabled. Optimization is good for production builds, but not good for debugging. During development, use --disable-optimizations to reduce compilation times and allow easier debugging. This option implicitly also enables --disable-inline

-
--disable-inline
-

Don't compile trivial methods as inline. Squid +

--disable-inline

Don't compile trivial methods as inline. Squid is coded with much of the code able to be inlined. Inlining is good for production builds, but not good for development. During development, use @@ -793,18 +733,15 @@ --enable-inline to have squid make all trivial methods inlinable by the compiler.

-
--enable-debug-cbdata
-

Provide some debug information in cbdata

+
--enable-debug-cbdata

Provide some debug information in cbdata

-
--enable-disk-io=\"list of modules\"
-

Build support for the list of disk I/O modules. +

--enable-disk-io=\"list of modules\"

Build support for the list of disk I/O modules. The default is only to build the "Blocking" module. See src/DiskIO for a list of available modules, or Programmers Guide for details on how to build your custom disk module.

-
--enable-esi
-

Enable ESI for accelerators. Requires libexpat. +

--enable-esi

Enable ESI for accelerators. Requires libexpat. Enabling ESI will cause squid to follow the Edge Acceleration Specification (www.esi.org). This causes squid to IGNORE client Cache-Control headers.

@@ -812,30 +749,23 @@ proxy, ONLY use it in a squid configured for webserver acceleration.

-
--enable-icap-client
-

Enable the ICAP client.

+
--enable-icap-client

Enable the ICAP client.

-
--disable-snmp
-

Disable SNMP monitoring support which is now built by default.

+
--disable-snmp

Disable SNMP monitoring support which is now built by default.

-
--disable-htcp
-

Disable HTCP protocol support which is now built by default.

+
--disable-htcp

Disable HTCP protocol support which is now built by default.

-
--enable-kqueue
-

Enable kqueue() support. Marked as experimental in 3.0.

+
--enable-kqueue

Enable kqueue() support. Marked as experimental in 3.0.

-
--enable-ipfw-transparent
-

Enable Transparent Proxy support for systems +

--enable-ipfw-transparent

Enable Transparent Proxy support for systems using FreeBSD IPFW style redirection.

-
--disable-mempools
-

Disable memPools. Note that this option now simply sets the +

--disable-mempools

Disable memPools. Note that this option now simply sets the default behaviour. Specific classes can override this at runtime, and only lib/MemPool.c needs to be altered to change the squid-wide default for all classes.

-
--enable-cpu-profiling
-

This option allows you to see which internal functions +

--enable-cpu-profiling

This option allows you to see which internal functions in Squid are consuming how much CPU. Compiles in probes that measure time spent in probed functions. Needs source modifications to add new probes. This is meant @@ -845,21 +775,16 @@ you shouldn't enable this, as overhead added, although small, is still overhead. See lib/Profiler.c for more.

-
--with-gnu-ld
-

Assume the C compiler uses GNU ld. The default is to auto-detect.

+
--with-gnu-ld

Assume the C compiler uses GNU ld. The default is to auto-detect.

-
--with-pic
-

Try to use only PIC/non-PIC objects. The default is to use both.

+
--with-pic

Try to use only PIC/non-PIC objects. The default is to use both.

-
--with-tags[=TAGS]
-

Include additional configurations. The default is automatic.

+
--with-tags[=TAGS]

Include additional configurations. The default is automatic.

-
--with-default-user=USER
-

Sets the default System User account for squid permissions. +

--with-default-user=USER

Sets the default System User account for squid permissions. The default is 'nobody' as in other releases of squid.

-
--with-cppunit-basedir=[PATH]
-

Path where the cppunit headers and libraries are found +

--with-cppunit-basedir=[PATH]

Path where the cppunit headers and libraries are found for unit testing. The default is automatic detection.

NOTE: Since 3.0-PRE6 and 2.6STABLE14 squid no longer comes bundled with CPPUnit. Compile-time validation will be disabled @@ -871,42 +796,33 @@

-
--enable-carp
-

CARP support is now built by default. +

--enable-carp

CARP support is now built by default. --disable-carp can be used to build without it.

-
--enable-htcp
-

HTCP protocol support is now built by default. +

--enable-htcp

HTCP protocol support is now built by default. Use --disable-htcp to build without it.

-
--enable-snmp
-

SNMP monitoring is now build by default. +

--enable-snmp

SNMP monitoring is now build by default. Use --disable-snmp to build without it.

-
--enable-heap-replacement
-

Please use --enable-removal-policies directive instead.

+
--enable-heap-replacement

Please use --enable-removal-policies directive instead.

-
--with-maxfd=N
-

Replaced by --with-filedescriptors=N

+
--with-maxfd=N

Replaced by --with-filedescriptors=N

Override maximum number of filedescriptors. Useful if you build as another user who is not privileged to use the number of filedescriptors you want the resulting binary to support

-
--enable-select
-

Deprecated. +

--enable-select

Deprecated. Automatic checks will enable best I/O loop method available.

-
--enable-epoll
-

Deprecated. +

--enable-epoll

Deprecated. Automatic checks will enable best I/O loop method available.

-
--enable-poll
-

Deprecated. +

--enable-poll

Deprecated. Automatic checks will enable best I/O loop method available.

-
--enable-kqueue
-

kqueue support is marked Experimental in Squid 3.0. Known to have some issues under load.

+
--enable-kqueue

kqueue support is marked Experimental in Squid 3.0. Known to have some issues under load.

@@ -916,14 +832,11 @@ porting one of these from Squid-2 to Squid-3 is most welcome.

-
--enable-devpoll
-

Support for Solaris /dev/poll

+
--enable-devpoll

Support for Solaris /dev/poll

-
--enable-select-simple
-

Basic POSIX select() loop without any binary fd_set optimizations.

+
--enable-select-simple

Basic POSIX select() loop without any binary fd_set optimizations.

-
--enable-follow-x-forwarded-for
-

Support following the X-Forwarded-For HTTP header for determining the +

--enable-follow-x-forwarded-for

Support following the X-Forwarded-For HTTP header for determining the client IP address

@@ -933,20 +846,13 @@

The following configure options have been removed.

-
--enable-dlmalloc
-

Most OS:es have good malloc implementations these days, and the version we used to ship with Squid was very very old..

-
--enable-mempool-debug
-

Debug option, not needed and therefore removed.

-
--enable-forward-log
-

Rarely used extra log file. Removed.

-
--enable-multicast-miss
-

Rarely used feature, and multicast ICP acheives almost the same result. Removed.

-
--enable-coss-aio-ops
-

Specific to the COSS implementation in Squid-2

-
--enable-large-cache-files
-

Now enabled by default. Configure option was redundant and therefore removed.

-
--enable-truncate
-

Known to cause race conditions where cache objects may get corrupted, and this for at most a marginal performance improvement. Removed.

+
--enable-dlmalloc

Most OS:es have good malloc implementations these days, and the version we used to ship with Squid was very very old..

+
--enable-mempool-debug

Debug option, not needed and therefore removed.

+
--enable-forward-log

Rarely used extra log file. Removed.

+
--enable-multicast-miss

Rarely used feature, and multicast ICP acheives almost the same result. Removed.

+
--enable-coss-aio-ops

Specific to the COSS implementation in Squid-2

+
--enable-large-cache-files

Now enabled by default. Configure option was redundant and therefore removed.

+
--enable-truncate

Known to cause race conditions where cache objects may get corrupted, and this for at most a marginal performance improvement. Removed.

diff -u -r squid-3.0.STABLE3/src/dns_internal.cc squid-3.0.STABLE4/src/dns_internal.cc --- squid-3.0.STABLE3/src/dns_internal.cc 2008-03-31 18:20:27.000000000 +1200 +++ squid-3.0.STABLE4/src/dns_internal.cc 2008-04-01 23:54:38.000000000 +1200 @@ -775,7 +775,7 @@ idnsSendQueryVC(q, ns); x = 0; } else { - x = comm_udp_sendto(DnsSocket, nameservers[ns].S, sizeof(nameservers[ns].S), q->buf, q->sz); + x = comm_udp_sendto(DnsSocket, &nameservers[ns].S, sizeof(nameservers[ns].S), q->buf, q->sz); } q->nsends++;