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 <http://www.squid-cache.org/bugs/>.
 #
@@ -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 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 3.0.STABLE3 release notes</TITLE>
+ <TITLE>Squid 3.0.STABLE4 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 3.0.STABLE3 release notes</H1>
+<H1>Squid 3.0.STABLE4 release notes</H1>
 
 <H2>Squid Developers</H2>$Id: release-3.0.sgml,v 1.30.2.5 2008/02/28 00:26:31 amosjeffries Exp $
 <HR>
@@ -15,7 +15,7 @@
 <HR>
 <H2><A NAME="s1">1. Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE3.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE4.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v3/3.0/">http://www.squid-cache.org/Versions/v3/3.0/</A> or the 
 <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
@@ -116,10 +116,8 @@
 <P>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:</P>
 <P>
 <DL>
-<DT><B>TCP_REFRESH_UNMODIFIED</B><DD>
-<P>The requested object was cached but STALE. The IMS query for the object resulted in "304 not modified".</P>
-<DT><B>TCP_REFRESH_MODIFIED</B><DD>
-<P>The requested object was cached but STALE. The IMS query returned the new content.</P>
+<DT><B>TCP_REFRESH_UNMODIFIED</B><DD><P>The requested object was cached but STALE. The IMS query for the object resulted in "304 not modified".</P>
+<DT><B>TCP_REFRESH_MODIFIED</B><DD><P>The requested object was cached but STALE. The IMS query returned the new content.</P>
 </DL>
 </P>
 <P>See 
@@ -152,8 +150,7 @@
 
 <P>
 <DL>
-<DT><B>minimum_icp_query_timeout (msec)</B><DD>
-<P>
+<DT><B>minimum_icp_query_timeout (msec)</B><DD><P>
 <PRE>
 Default: 5
 
@@ -167,8 +164,7 @@
         
 </PRE>
 </P>
-<DT><B>background_ping_rate</B><DD>
-<P>
+<DT><B>background_ping_rate</B><DD><P>
 <PRE>
 Default: 10 seconds
 
@@ -178,8 +174,7 @@
 </PRE>
 </P>
 
-<DT><B>httpd_accel_surrogate_id</B><DD>
-<P>
+<DT><B>httpd_accel_surrogate_id</B><DD><P>
 <PRE>
 Default: unset
 
@@ -191,8 +186,7 @@
 </PRE>
 </P>
 
-<DT><B>http_accel_surrogate_remote on|off</B><DD>
-<P>
+<DT><B>http_accel_surrogate_remote on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -202,8 +196,7 @@
 </PRE>
 </P>
 
-<DT><B>esi_parser libxml2|expat|custom</B><DD>
-<P>
+<DT><B>esi_parser libxml2|expat|custom</B><DD><P>
 <PRE>
 Default: custom
 
@@ -214,8 +207,7 @@
 </PRE>
 </P>
 
-<DT><B>email_err_data on|off</B><DD>
-<P>
+<DT><B>email_err_data on|off</B><DD><P>
 <PRE>
 Default: on
 
@@ -227,8 +219,7 @@
 </PRE>
 </P>
 
-<DT><B>refresh_all_ims on|off</B><DD>
-<P>
+<DT><B>refresh_all_ims on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -243,13 +234,10 @@
         
 </PRE>
 </P>
-<DT><B>request_header_access</B><DD>
-<P>Replaces the header_access directive of Squid-2.6 and earlier, but applies to requests only.</P>
-<DT><B>reply_header_access</B><DD>
-<P>Replaces the header_access directive of Squid-2.6 and earlier, but applies to replies only.</P>
+<DT><B>request_header_access</B><DD><P>Replaces the header_access directive of Squid-2.6 and earlier, but applies to requests only.</P>
+<DT><B>reply_header_access</B><DD><P>Replaces the header_access directive of Squid-2.6 and earlier, but applies to replies only.</P>
 
-<DT><B>icap_enable on|off</B><DD>
-<P>
+<DT><B>icap_enable on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -257,8 +245,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_preview_enable on|off</B><DD>
-<P>
+<DT><B>icap_preview_enable on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -267,8 +254,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_preview_size</B><DD>
-<P>
+<DT><B>icap_preview_size</B><DD><P>
 <PRE>
 Default: -1
 
@@ -278,8 +264,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_default_options_ttl (seconds)</B><DD>
-<P>
+<DT><B>icap_default_options_ttl (seconds)</B><DD><P>
 <PRE>
 Default: 60
 
@@ -288,8 +273,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_persistent_connections on|off</B><DD>
-<P>
+<DT><B>icap_persistent_connections on|off</B><DD><P>
 <PRE>
 Default: on
 
@@ -298,8 +282,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_send_client_ip on|off</B><DD>
-<P>
+<DT><B>icap_send_client_ip on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -307,8 +290,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_send_client_username on|off</B><DD>
-<P>
+<DT><B>icap_send_client_username on|off</B><DD><P>
 <PRE>
 Default: off
 
@@ -317,8 +299,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_service</B><DD>
-<P>
+<DT><B>icap_service</B><DD><P>
 <PRE>
 Default: none
 
@@ -342,8 +323,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_class</B><DD>
-<P>
+<DT><B>icap_class</B><DD><P>
 <PRE>
 Default: none
 
@@ -358,8 +338,7 @@
         
 </PRE>
 </P>
-<DT><B>icap_access</B><DD>
-<P>
+<DT><B>icap_access</B><DD><P>
 <PRE>
 Default: none
 
@@ -383,8 +362,7 @@
 </PRE>
 </P>
 
-<DT><B>accept_filter</B><DD>
-<P>
+<DT><B>accept_filter</B><DD><P>
 <PRE>
 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 @@
 </PRE>
 </P>
 
-<DT><B>include</B><DD>
-<P>New option to import entire secondary configuration files into squid.conf.
+<DT><B>include</B><DD><P>New option to import entire secondary configuration files into squid.conf.
 <PRE>
         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 @@
 </PRE>
 </P>
 
-<DT><B>acl myportname</B><DD>
-<P>New acl type myportname, matching the name of the http(s)_port where the request was accepted
+<DT><B>acl myportname</B><DD><P>New acl type myportname, matching the name of the http(s)_port where the request was accepted
 <PRE>
         acl aclname myportname 3128 ...         # http(s)_port name
         
@@ -429,8 +405,7 @@
 
 <P>
 <DL>
-<DT><B>http_port</B><DD>
-<P>New options:
+<DT><B>http_port</B><DD><P>New options:
 <PRE>
     disable-pmtu-discovery=
       Control Path-MTU discovery usage:
@@ -456,15 +431,13 @@
         
 </PRE>
         </P>
-<DT><B> https_port</B><DD>
-<P>Removed options:
+<DT><B> https_port</B><DD><P>Removed options:
 <PRE>
     urlgroup=, not yet ported to Squid-3.
         
 </PRE>
 </P>
-<DT><B>cache_peer</B><DD>
-<P>New options:
+<DT><B>cache_peer</B><DD><P>New options:
 <PRE>
      basetime=n
 
@@ -504,8 +477,7 @@
         
 </PRE>
 </P>
-<DT><B>cache_dir</B><DD>
-<P>Common options
+<DT><B>cache_dir</B><DD><P>Common options
 <PRE>
     no-store, replaces the older read-only option
 
@@ -528,8 +500,7 @@
         
 </PRE>
 </P>
-<DT><B>auth_param</B><DD>
-<P>Removed Basic auth option
+<DT><B>auth_param</B><DD><P>Removed Basic auth option
 <PRE>
     blankpasswor, not yet ported to squid-3.
     auth_param basic concurrency 0
@@ -543,8 +514,7 @@
 </PRE>
 </P>
 
-<DT><B>external_acl_type</B><DD>
-<P>New format specifications:
+<DT><B>external_acl_type</B><DD><P>New format specifications:
 <PRE>
     %URI          Requested URI
 
@@ -568,8 +538,7 @@
 </PRE>
 </P>
 
-<DT><B>refresh_pattern</B><DD>
-<P>New options:
+<DT><B>refresh_pattern</B><DD><P>New options:
 <PRE>
     ignore-no-store
     refresh-ims
@@ -586,8 +555,7 @@
         
 </PRE>
 </P>
-<DT><B>acl</B><DD>
-<P>New types:
+<DT><B>acl</B><DD><P>New types:
 <PRE>
     acl aclname http_status 200 301 500- 400-403 ...     # status code in reply
 
@@ -604,16 +572,14 @@
         
 </PRE>
 </P>
-<DT><B>short_icon_urls</B><DD>
-<P>New default:
+<DT><B>short_icon_urls</B><DD><P>New default:
 <PRE>
     Default: on
     (Old default: off)
         
 </PRE>
 </P>
-<DT><B>delay_class</B><DD>
-<P>New delay classes:
+<DT><B>delay_class</B><DD><P>New delay classes:
 <PRE>
     class 4 Everything in a class 3 delay pool, with an
     additional limit on a per user basis. This
@@ -627,8 +593,7 @@
 </PRE>
 </P>
 
-<DT><B>htcp_port</B><DD>
-<P>New default to require the feature to be enabled in squid.conf:
+<DT><B>htcp_port</B><DD><P>New default to require the feature to be enabled in squid.conf:
 <PRE>
     Default: 0 (disabled)
     (Old default: 4827)
@@ -636,8 +601,7 @@
 </PRE>
 </P>
 
-<DT><B>icp_port</B><DD>
-<P>New default to require the feature to be enabled in squid.conf:
+<DT><B>icp_port</B><DD><P>New default to require the feature to be enabled in squid.conf:
 <PRE>
     Default: 0 (disabled)
     (Old default: 3130)
@@ -645,8 +609,7 @@
 </PRE>
 </P>
 
-<DT><B>snmp_port</B><DD>
-<P>New default to require the feature to be enabled in squid.conf:
+<DT><B>snmp_port</B><DD><P>New default to require the feature to be enabled in squid.conf:
 <PRE>
     Default: 0 (disabled)
     (Old default: 3401)
@@ -654,8 +617,7 @@
 </PRE>
 </P>
 
-<DT><B>logformat</B><DD>
-<P>New format tags:
+<DT><B>logformat</B><DD><P>New format tags:
 <PRE>
     rp      Request URL-Path excluding hostname
 
@@ -677,8 +639,7 @@
 </PRE>
 </P>
 
-<DT><B>reply_body_max_size</B><DD>
-<P>Syntax changed:
+<DT><B>reply_body_max_size</B><DD><P>Syntax changed:
 <PRE>
     reply_body_max_size size [acl acl...]
         
@@ -686,11 +647,9 @@
 </P>
 <P>allow/deny no longer used.</P>
 
-<DT><B>url_rewrite_program</B><DD>
-<P>No urlgroup support in either requests or responese</P>
+<DT><B>url_rewrite_program</B><DD><P>No urlgroup support in either requests or responese</P>
 
-<DT><B>auth_param</B><DD>
-<P>fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string.
+<DT><B>auth_param</B><DD><P>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</P>
 
 </DL>
@@ -703,32 +662,19 @@
 
 <P>
 <DL>
-<DT><B>broken_vary_encoding</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>cache_vary</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>collapsed_forwarding</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>follow_x_forwarded_for</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>*_uses_indirect_client</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>error_map</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>header_access</B><DD>
-<P>This has been replaced by request_header_access and reply_header_access</P>
-<DT><B>http_access2</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>httpd_accel_no_pmtu_disc</B><DD>
-<P>Replaced by disable-pmtu-discovery http_port option</P>
-<DT><B>location_rewrite_*</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>refresh_stale_hit</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>umask</B><DD>
-<P>Not yet ported to Squid-3.</P>
-<DT><B>wais_relay_*</B><DD>
-<P>equivalent to cache_peer + cache_peer_access.</P>
+<DT><B>broken_vary_encoding</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>cache_vary</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>collapsed_forwarding</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>follow_x_forwarded_for</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>*_uses_indirect_client</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>error_map</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>header_access</B><DD><P>This has been replaced by request_header_access and reply_header_access</P>
+<DT><B>http_access2</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>httpd_accel_no_pmtu_disc</B><DD><P>Replaced by disable-pmtu-discovery http_port option</P>
+<DT><B>location_rewrite_*</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>refresh_stale_hit</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>umask</B><DD><P>Not yet ported to Squid-3.</P>
+<DT><B>wais_relay_*</B><DD><P>equivalent to cache_peer + cache_peer_access.</P>
 </DL>
 </P>
 
@@ -757,33 +703,27 @@
 
 <P>
 <DL>
-<DT><B>--enable-shared[=PKGS]</B><DD>
-<P>Build shared libraries. The default is to build without.</P>
+<DT><B>--enable-shared[=PKGS]</B><DD><P>Build shared libraries. The default is to build without.</P>
 
-<DT><B>--enable-static[=PKGS]</B><DD>
-<P>Build static libraries. The default is on.</P>
+<DT><B>--enable-static[=PKGS]</B><DD><P>Build static libraries. The default is on.</P>
 
-<DT><B>--enable-fast-install[=PKGS]</B><DD>
-<P>
+<DT><B>--enable-fast-install[=PKGS]</B><DD><P>
 <PRE>
 Optimize for fast installation
         default: yes
 </PRE>
 </P>
 
-<DT><B>--disable-libtool-lock</B><DD>
-<P>Avoid locking (might break parallel builds)</P>
+<DT><B>--disable-libtool-lock</B><DD><P>Avoid locking (might break parallel builds)</P>
 
-<DT><B>--disable-optimizations</B><DD>
-<P>Don't compile Squid with compiler optimizations enabled.
+<DT><B>--disable-optimizations</B><DD><P>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</P>
 
-<DT><B>--disable-inline</B><DD>
-<P>Don't compile trivial methods as inline. Squid
+<DT><B>--disable-inline</B><DD><P>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.</P>
 
-<DT><B>--enable-debug-cbdata</B><DD>
-<P>Provide some debug information in cbdata</P>
+<DT><B>--enable-debug-cbdata</B><DD><P>Provide some debug information in cbdata</P>
 
-<DT><B>--enable-disk-io=\"list of modules\"</B><DD>
-<P>Build support for the list of disk I/O modules.
+<DT><B>--enable-disk-io=\"list of modules\"</B><DD><P>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.</P>
 
-<DT><B>--enable-esi</B><DD>
-<P>Enable ESI for accelerators. Requires libexpat.
+<DT><B>--enable-esi</B><DD><P>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.</P>
@@ -812,30 +749,23 @@
 proxy, ONLY use it in a squid configured for
 webserver acceleration.</P>
 
-<DT><B>--enable-icap-client</B><DD>
-<P>Enable the ICAP client.</P>
+<DT><B>--enable-icap-client</B><DD><P>Enable the ICAP client.</P>
 
-<DT><B>--disable-snmp</B><DD>
-<P>Disable SNMP monitoring support which is now built by default.</P>
+<DT><B>--disable-snmp</B><DD><P>Disable SNMP monitoring support which is now built by default.</P>
 
-<DT><B>--disable-htcp</B><DD>
-<P>Disable HTCP protocol support which is now built by default.</P>
+<DT><B>--disable-htcp</B><DD><P>Disable HTCP protocol support which is now built by default.</P>
 
-<DT><B>--enable-kqueue</B><DD>
-<P>Enable kqueue() support. Marked as experimental in 3.0.</P>
+<DT><B>--enable-kqueue</B><DD><P>Enable kqueue() support. Marked as experimental in 3.0.</P>
 
-<DT><B>--enable-ipfw-transparent</B><DD>
-<P>Enable Transparent Proxy support for systems
+<DT><B>--enable-ipfw-transparent</B><DD><P>Enable Transparent Proxy support for systems
 using FreeBSD IPFW style redirection.</P>
 
-<DT><B>--disable-mempools</B><DD>
-<P>Disable memPools. Note that this option now simply sets the
+<DT><B>--disable-mempools</B><DD><P>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.</P>
 
-<DT><B>--enable-cpu-profiling</B><DD>
-<P>This option allows you to see which internal functions
+<DT><B>--enable-cpu-profiling</B><DD><P>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.</P>
 
-<DT><B>--with-gnu-ld</B><DD>
-<P>Assume the C compiler uses GNU ld. The default is to auto-detect.</P>
+<DT><B>--with-gnu-ld</B><DD><P>Assume the C compiler uses GNU ld. The default is to auto-detect.</P>
 
-<DT><B>--with-pic</B><DD>
-<P>Try to use only PIC/non-PIC objects. The default is to use both.</P>
+<DT><B>--with-pic</B><DD><P>Try to use only PIC/non-PIC objects. The default is to use both.</P>
 
-<DT><B>--with-tags[=TAGS]</B><DD>
-<P>Include additional configurations. The default is automatic.</P>
+<DT><B>--with-tags[=TAGS]</B><DD><P>Include additional configurations. The default is automatic.</P>
 
-<DT><B>--with-default-user=USER</B><DD>
-<P>Sets the default System User account for squid permissions.
+<DT><B>--with-default-user=USER</B><DD><P>Sets the default System User account for squid permissions.
 The default is 'nobody' as in other releases of squid.</P>
 
-<DT><B>--with-cppunit-basedir=[PATH]</B><DD>
-<P>Path where the cppunit headers and libraries are found
+<DT><B>--with-cppunit-basedir=[PATH]</B><DD><P>Path where the cppunit headers and libraries are found
 for unit testing. The default is automatic detection.</P>
 <P>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 @@
 
 <P>
 <DL>
-<DT><B>--enable-carp</B><DD>
-<P>CARP support is now built by default.
+<DT><B>--enable-carp</B><DD><P>CARP support is now built by default.
 --disable-carp can be used to build without it.</P>
 
-<DT><B>--enable-htcp</B><DD>
-<P>HTCP protocol support is now built by default.
+<DT><B>--enable-htcp</B><DD><P>HTCP protocol support is now built by default.
 Use --disable-htcp to build without it.</P>
 
-<DT><B>--enable-snmp</B><DD>
-<P>SNMP monitoring is now build by default.
+<DT><B>--enable-snmp</B><DD><P>SNMP monitoring is now build by default.
 Use --disable-snmp to build without it.</P>
 
-<DT><B>--enable-heap-replacement</B><DD>
-<P>Please use --enable-removal-policies directive instead.</P>
+<DT><B>--enable-heap-replacement</B><DD><P>Please use --enable-removal-policies directive instead.</P>
 
-<DT><B>--with-maxfd=N</B><DD>
-<P>Replaced by --with-filedescriptors=N</P>
+<DT><B>--with-maxfd=N</B><DD><P>Replaced by --with-filedescriptors=N</P>
 <P>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</P>
 
-<DT><B>--enable-select</B><DD>
-<P>Deprecated.
+<DT><B>--enable-select</B><DD><P>Deprecated.
 Automatic checks will enable best I/O loop method available.</P>
 
-<DT><B>--enable-epoll</B><DD>
-<P>Deprecated.
+<DT><B>--enable-epoll</B><DD><P>Deprecated.
 Automatic checks will enable best I/O loop method available.</P>
 
-<DT><B>--enable-poll</B><DD>
-<P>Deprecated.
+<DT><B>--enable-poll</B><DD><P>Deprecated.
 Automatic checks will enable best I/O loop method available.</P>
 
-<DT><B>--enable-kqueue</B><DD>
-<P>kqueue support is marked Experimental in Squid 3.0. Known to have some issues under load.</P>
+<DT><B>--enable-kqueue</B><DD><P>kqueue support is marked Experimental in Squid 3.0. Known to have some issues under load.</P>
 
 </DL>
 </P>
@@ -916,14 +832,11 @@
 porting one of these from Squid-2 to Squid-3 is most welcome.</P>
 <P>
 <DL>
-<DT><B>--enable-devpoll</B><DD>
-<P>Support for Solaris /dev/poll</P>
+<DT><B>--enable-devpoll</B><DD><P>Support for Solaris /dev/poll</P>
 
-<DT><B>--enable-select-simple</B><DD>
-<P>Basic POSIX select() loop without any binary fd_set optimizations.</P>
+<DT><B>--enable-select-simple</B><DD><P>Basic POSIX select() loop without any binary fd_set optimizations.</P>
 
-<DT><B>--enable-follow-x-forwarded-for</B><DD>
-<P>Support following the X-Forwarded-For HTTP header for determining the
+<DT><B>--enable-follow-x-forwarded-for</B><DD><P>Support following the X-Forwarded-For HTTP header for determining the
 client IP address</P>
 </DL>
 </P>
@@ -933,20 +846,13 @@
 <P>The following configure options have been removed.</P>
 <P>
 <DL>
-<DT><B>--enable-dlmalloc</B><DD>
-<P>Most OS:es have good malloc implementations these days, and the version we used to ship with Squid was very very old..</P>
-<DT><B>--enable-mempool-debug</B><DD>
-<P>Debug option, not needed and therefore removed.</P>
-<DT><B>--enable-forward-log</B><DD>
-<P>Rarely used extra log file. Removed.</P>
-<DT><B>--enable-multicast-miss</B><DD>
-<P>Rarely used feature, and multicast ICP acheives almost the same result. Removed.</P>
-<DT><B>--enable-coss-aio-ops</B><DD>
-<P>Specific to the COSS implementation in Squid-2</P>
-<DT><B>--enable-large-cache-files</B><DD>
-<P>Now enabled by default. Configure option was redundant and therefore removed.</P>
-<DT><B>--enable-truncate</B><DD>
-<P>Known to cause race conditions where cache objects may get corrupted, and this for at most a marginal performance improvement. Removed.</P>
+<DT><B>--enable-dlmalloc</B><DD><P>Most OS:es have good malloc implementations these days, and the version we used to ship with Squid was very very old..</P>
+<DT><B>--enable-mempool-debug</B><DD><P>Debug option, not needed and therefore removed.</P>
+<DT><B>--enable-forward-log</B><DD><P>Rarely used extra log file. Removed.</P>
+<DT><B>--enable-multicast-miss</B><DD><P>Rarely used feature, and multicast ICP acheives almost the same result. Removed.</P>
+<DT><B>--enable-coss-aio-ops</B><DD><P>Specific to the COSS implementation in Squid-2</P>
+<DT><B>--enable-large-cache-files</B><DD><P>Now enabled by default. Configure option was redundant and therefore removed.</P>
+<DT><B>--enable-truncate</B><DD><P>Known to cause race conditions where cache objects may get corrupted, and this for at most a marginal performance improvement. Removed.</P>
 
 </DL>
 </P>
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++;
