16 files changed, 1088 insertions, 3213 deletions

diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index c4a531b9472e..52511d883e78 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -9,15 +9,11 @@
 #   Which user/group Squid should run as (default: squid/squid).
 #   The user and group will be created if they do not already exist using
 #   a uid:gid of 100:100.
-#   NOTE: before version 2.5.4_6, these settings defaulted to
-#   nobody/nogroup.
-#   If you wish to keep these settings, please define SQUID_UID=nobody and
-#   SQUID_GID=nogroup in your make environment before you start the update.
-#   NOTE2:
-#   Before version 2.5.4_11 the numerical id chosen for SQUID_UID (and
-#   SQUID_GID respectively) was the first free id greater than or equal 3128.
-#   If you wish to move your squid user to id 100:100, run "make changeuser",
-#   please see the changeuser target's definition for further information.
+#   NOTE: older versions of Squid defaulted to nobody/nogroup.
+#   If you wish to run Squid as "nobody" (which is not recommended), please
+#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
+#   before you start the update or installation of this port.
+#
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
@@ -39,7 +35,7 @@
 #   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
 #
 #   The list below may be incomplete, please see the configure script
-#   in the squid source distribution for the complete list of additional
+#   in the Squid source distribution for the complete list of additional
 #   options.
 #   Note that you probably do not need to worry about these options in most
 #   cases, they are included in case you want to experiment with them.
@@ -47,11 +43,10 @@
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
 #    --enable-gnuregex
-#     Compile and use the supplied GNUregex routines instead of BSD regex.
+#     Compile and use the supplied GNUregex routines instead of BSD regex
+#     (not recommended).
 #    --enable-xmalloc-statistics
 #     Show malloc statistics in status page
-#    --enable-time-hack
-#     Optimize time updates to one per second rather than calling gettimeofday()
 #    --enable-cachemgr-hostname=some.hostname
 #     Set an explicit hostname in cachemgr.cgi
 #    --enable-truncate
@@ -69,39 +64,53 @@
 #    --enable-ntlm-fail-open
 #     Enable NTLM fail open, where a helper that fails one of the
 #     Authentication steps can allow Squid to still authenticate the user
-#
+#    --enable-x-accelerator-vary
+#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
+#     to indicate variance within an accelerator setup. Typically used
+#     together with other code that adds custom HTTP headers to the
+#     requests.
+#    --enable-forward-log
+#     Enable experimental forward_log directive.
+#    --enable-multicast-miss
+#     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.5.14
-PORTREVISION=	4
+PORTVERSION=	2.6.9
 CATEGORIES=	www
-MASTER_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
+MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
+		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
+		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
+DISTNAME=	squid-2.6.STABLE9
+DIST_SUBDIR=	squid2.6
+
+PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www2.us.squid-cache.org/%SUBDIR%/ \
 		http://www3.us.squid-cache.org/%SUBDIR%/ \
 		http://www1.at.squid-cache.org/%SUBDIR%/ \
 		http://www2.nl.squid-cache.org/%SUBDIR%/ \
 		http://www1.ru.squid-cache.org/%SUBDIR%/ \
 		http://www1.uk.squid-cache.org/%SUBDIR%/ \
-		http://www1.gr.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www1.tw.squid-cache.org/%SUBDIR%/
-MASTER_SITE_SUBDIR=	Versions/v2/2.5
-DISTNAME=	squid-2.5.STABLE14
-DIST_SUBDIR=	squid2.5
-
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	Versions/v2/2.5/bugs
-PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
-		squid-2.5.STABLE14-hierarchy_tag.patch
+PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
+PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	HTTP Caching Proxy
 
-CONFLICTS=	squid-2.[^5]*
+CONFLICTS=	squid-2.[^6]*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
+USE_RC_SUBR=	squid
 
 SQUID_UID?=	squid
 SQUID_GID?=	squid
@@ -116,20 +125,19 @@ OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
 		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
 		SQUID_DELAY_POOLS "Enable delay pools" off \
 		SQUID_SNMP "Enable SNMP support" off \
-		SQUID_CARP "Enable CARP support" off \
+		SQUID_CARP "Enable CARP support" on \
 		SQUID_SSL "Enable SSL support for reverse proxies" off \
 		SQUID_PINGER "Install the icmp helper" off \
 		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
 		SQUID_HTCP "Enable HTCP support" off \
 		SQUID_VIA_DB "Enable forward/via database" off \
 		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Protocol" on \
-		SQUID_UNDERSCORES "Allow underscores in hostnames" on \
-		SQUID_CHECK_HOSTNAME "Do hostname checking" on \
+		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
+		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
 		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
 		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
+		SQUID_REFERER_LOG "Enable Referer-header logging" off \
 		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_CUSTOM_LOG "Enable custom log format" off \
 		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
 		SQUID_PF "Enable transparent proxying with PF" off \
 		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
@@ -137,9 +145,9 @@ OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
 		SQUID_ICAP "Enable ICAP client functionality" off \
 		SQUID_AUFS "Enable the aufs storage scheme" off \
 		SQUID_COSS "Enable the COSS storage scheme" off \
+		SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \
 		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
-		SQUID_RCNG "Install an rc.d style startup script" on
+		SQUID_STACKTRACES "Create backtraces on fatal errors" off
 
 etc_files=	squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
@@ -167,37 +175,44 @@ error_files=	ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
 		ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
 		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
 
-libexec=	cachemgr.cgi digest_pw_auth diskd ip_user_check \
+libexec=	cachemgr.cgi digest_pw_auth diskd-daemon ip_user_check \
 		msnt_auth ncsa_auth ntlm_auth \
-		pam_auth smb_auth smb_auth.sh squid_unix_group \
-		wb_auth wb_group wb_ntlmauth wbinfo_group.pl
+		pam_auth smb_auth smb_auth.sh squid_session squid_unix_group \
+		wbinfo_group.pl
 .if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
 libexec+=	unlinkd
 .endif
 
-sbin=		RunAccel RunCache squidclient squid
+sbin=		RunCache squidclient squid
 
-CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
+CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
+		--sbindir=${PREFIX}/sbin  \
 		--datadir=${PREFIX}/etc/squid \
 		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
-		--enable-removal-policies="lru heap"
+		--sysconfdir=${PREFIX}/etc/squid \
+		--enable-removal-policies="lru heap" \
+		--disable-linux-netfilter \
+		--disable-linux-tproxy \
+		--disable-epoll
 
 .include <bsd.port.pre.mk>
 
 # Authentication methods and modules:
 
-basic_auth=	NCSA PAM MSNT SMB winbind
-external_acl=	ip_user unix_group wbinfo_group winbind_group
-MAN8+=		pam_auth.8 squid_unix_group.8
+basic_auth=	NCSA PAM MSNT SMB
+digest_auth=	password
+external_acl=	ip_user session unix_group wbinfo_group
+MAN8+=		ncsa_auth.8 pam_auth.8 squid_session.8 squid_unix_group.8
 .if defined(WITH_SQUID_LDAP_AUTH)
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
 basic_auth+=	LDAP
+digest_auth+=	ldap
 external_acl+=	ldap_group
-libexec+=	squid_ldap_auth squid_ldap_group
+libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
 .if defined(WITH_SQUID_SASL_AUTH)
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
@@ -213,23 +228,33 @@ libexec+=	yp_auth
 .endif
 CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
 			--enable-basic-auth-helpers="${basic_auth}" \
-			--enable-digest-auth-helpers="password" \
+			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
-			--enable-ntlm-auth-helpers="SMB winbind"
+			--enable-ntlm-auth-helpers="SMB"
 
-# Selection of storage schemes:
+# Storage schemes:
 
 storage_schemes=	ufs diskd null
 .if defined(WITH_SQUID_AUFS)
 storage_schemes+=	aufs
+.if ${OSVERSION}>=501000
+# Only document libmap.conf where it is available:
+EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
+.endif
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
-CONFIGURE_ARGS+=	--enable-async-io \
-			--with-pthreads
+CONFIGURE_ARGS+=	--with-pthreads
 CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 .if defined(WITH_SQUID_COSS)
 storage_schemes+=	coss
-CONFIGURE_ARGS+=	--with-aio
+.if !defined(WITH_SQUID_AUFS)
+# use Posix AIO instead of aufs' AIO; note that you then need the kernel to
+# supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by
+# adding the option VFS_AIO to your kernel configuration if you want to
+# actually use COSS storage:
+CONFIGURE_ARGS+=	--enable-coss-aio-ops
+.endif
+sbin+=		cossdump
 .endif
 CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
 
@@ -241,13 +266,14 @@ CONFIGURE_ARGS+=	--enable-delay-pools
 .if defined(WITH_SQUID_SNMP)
 CONFIGURE_ARGS+=	--enable-snmp
 .endif
-.if defined(WITH_SQUID_CARP)
-CONFIGURE_ARGS+=	--enable-carp
+.if defined(WITHOUT_SQUID_CARP)
+CONFIGURE_ARGS+=	--disable-carp
 .endif
 .if defined(WITH_SQUID_SSL)
-# we need to .include bsd.openssl.mk manually here because USE_OPENSSL only
-# works when it is defined before bsd.port{.pre}.mk is .included and this is
-# not possible when using OPTIONS
+# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
+# works when it is defined before bsd.port{.pre}.mk is .included.
+# This makes it currently impossible to combine this macro with OPTIONS to
+# conditionally include OpenSSL support.
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
@@ -274,11 +300,8 @@ CONFIGURE_ARGS+=	--enable-cache-digests
 .if defined(WITHOUT_SQUID_WCCP)
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if !defined(WITHOUT_SQUID_UNDERSCORES)
-CONFIGURE_ARGS+=	--enable-underscores
-.endif
-.if defined(WITHOUT_SQUID_CHECK_HOSTNAME)
-CONFIGURE_ARGS+=	--disable-hostname-checks
+.if defined(WITH_SQUID_WCCPV2)
+CONFIGURE_ARGS+=	--enable-wccpv2
 .endif
 .if defined(WITH_SQUID_STRICT_HTTP)
 CONFIGURE_ARGS+=	--disable-http-violations
@@ -286,12 +309,12 @@ CONFIGURE_ARGS+=	--disable-http-violations
 .if defined(WITHOUT_SQUID_IDENT)
 CONFIGURE_ARGS+=	--disable-ident-lookups
 .endif
+.if defined(WITH_SQUID_REFERER_LOG)
+CONFIGURE_ARGS+=	--enable-referer-log
+.endif
 .if defined(WITH_SQUID_USERAGENT_LOG)
 CONFIGURE_ARGS+=	--enable-useragent-log
 .endif
-.if defined(WITH_SQUID_CUSTOM_LOG)
-EXTRA_PATCHES+=		${PATCHDIR}/customlog-2.5.patch
-.endif
 .if defined(WITH_SQUID_ARP_ACL)
 CONFIGURE_ARGS+=	--enable-arp-acl
 .endif
@@ -315,45 +338,39 @@ CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
 .endif
 .if defined(WITH_SQUID_FOLLOW_XFF)
-EXTRA_PATCHES+=		${PATCHDIR}/follow_xff-2.5.patch \
-			${PATCHDIR}/follow_xff-configure.patch
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
 .if defined(WITH_SQUID_ICAP)
-EXTRA_PATCHES+=		${PATCHDIR}/icap-2.5-core.patch \
-			${PATCHDIR}/icap-2.5-bootstrap.patch
+EXTRA_PATCHES+=		${PATCHDIR}/icap-2.6-bootstrap.patch \
+			${PATCHDIR}/icap-2.6-core.patch
 CONFIGURE_ARGS+=	--enable-icap-support
 error_files+=		ERR_ICAP_FAILURE
 .endif
+.if !defined(WITHOUT_SQUID_KQUEUE)
+CONFIGURE_ARGS+=	--enable-kqueue
+.else
+CONFIGURE_ARGS+=	--disable-kqueue
+.endif
 .if defined(WITH_SQUID_LARGEFILE)
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES)
+.if defined(WITH_SQUID_STACKTRACES) || defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=			""
 .endif
-.if !defined(WITHOUT_SQUID_RCNG)
-USE_RC_SUBR=	squid.sh
-rc_del=		rcold
-rc_state=	rcng
-.else
-SUB_FILES+=	squid.sh
-etc_files+=	rc.d/squid.sh
-rc_del=		rcng
-rc_state=	rcold
-.endif
 
 # Languages:
 #
 # If you do not define SQUID_LANGUAGES yourself, all available language files
 # will be installed; the default language will be English.
 
-SQUID_LANGUAGES?=	\
-	Azerbaijani Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
-	French German Greek Hebrew Hungarian Italian Japanese Korean Lithuanian \
-	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
-	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_LANGUAGES?=	Azerbaijani Bulgarian Catalan Czech Danish Dutch \
+			English Estonian Finnish French German Greek Hebrew \
+			Hungarian Italian Japanese Korean Lithuanian \
+			Polish Portuguese Romanian Russian-1251 Russian-koi8-r \
+			Serbian Simplify_Chinese Slovak Spanish Swedish \
+			Traditional_Chinese Turkish
 SQUID_DEFAULT_LANG?=	English
 CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 			--enable-default-err-language=${SQUID_DEFAULT_LANG}
@@ -378,7 +395,8 @@ PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
-	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
+	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${WRKSRC}/helpers/basic_auth/SMB/Makefile.in \
 	    ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh
@@ -387,31 +405,16 @@ pre-install:
 # Prevent installation of .orig files by deleting them.
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
-# create the start script:
-	@${REINPLACE_CMD} \
-	    -e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
-	    -e '/--.*${rc_state}/d' ${WRKDIR}/squid.sh
-# create variable information in pkg-message:
-	@${REINPLACE_CMD} \
-	    -e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
-	    -e '/--.*${rc_state}/d' ${PKGMESSAGE}
 
 pre-su-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-# Create cachemgr.conf.default manually since squid's install routine
-# unfortunately fails to do so:
-	${INSTALL_DATA} ${WRKSRC}/src/cachemgr.conf \
-	    ${PREFIX}/etc/squid/cachemgr.conf.default
 .if defined(WITH_SQUID_PINGER)
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-.if defined(WITHOUT_SQUID_RCNG)
-	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
@@ -423,50 +426,5 @@ post-install:
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
-changeuser:
-# Recover from the problem that earlier versions of this port created the
-# squid pseudo-user with an id greater than 999 which is not allowed in
-# FreeBSD's ports system. The port now uses id 100:100.
-# NOTE:
-# This target assumes that SQUID_GID is the primary group of SQUID_UID. If you
-# have a different setup, do not run this target!
-.if ${SQUID_UID:L} == nobody
-	@${ECHO_CMD} "'nobody' is a system user, you do not need to execute"; \
-	${ECHO_CMD} "this target!"
-	${FALSE}
-.endif
-	@if [ `${ID} -u` -ne 0 ]; \
-	then ${ECHO_CMD} "Sorry, you must be root to use this target."; ${FALSE}; fi; \
-	current_uid=`id -u ${SQUID_UID}`; \
-	current_gid=`pw groupshow ${SQUID_GID}|cut -f 3 -d :`; \
-	${ECHO_CMD} "I will remove this user:"; \
-	${ID} -P $${current_uid}; \
-	${ECHO_CMD} "and this group:"; \
-	pw groupshow ${SQUID_GID}; \
-	${ECHO_CMD} "I will then re-create them with a user and group id of 100."; \
-	${ECHO_CMD} "Then all files and directories under ${PREFIX} and /var that"; \
-	${ECHO_CMD} "are owned by uid $${current_uid} will be chown(1)'ed."; \
-	${ECHO_CMD} "After that, all files and directories that were accessible"; \
-	${ECHO_CMD} "by group $${current_gid} will chgrp(1)'ed respectively."; \
-	${ECHO_CMD} "Note that this assumes group '${SQUID_GID}' to be the primary"; \
-	${ECHO_CMD} "group of user '${SQUID_UID}'. If you have a different setup"; \
-	${ECHO_CMD} "please abort this target now."; \
-	read -p "Press RETURN to continue or CTRL-C to abort:" dummy ; \
-	${ECHO_CMD} "OK, here we go:"; \
-	${ECHO_CMD} "deleting user $${current_uid} and his primary group..."; \
-	pw userdel -u $${current_uid}; \
-	${ECHO_CMD} "adding user ${SQUID_UID} with id 100..."; \
-	pw groupadd -n ${SQUID_GID} -g 100; \
-	pw useradd -n ${SQUID_UID} -u 100 -c "squid caching-proxy pseudo user" \
-	    -d ${PREFIX}/squid -s /sbin/nologin -h - ; \
-	${ECHO_CMD} "chown(1)'ing everything under ${PREFIX} from $${current_uid} to 100..."; \
-	${FIND} -H ${PREFIX} -user $${current_uid} -exec ${CHOWN} 100 {} \; ; \
-	${ECHO_CMD} "chgrp(1)'ing everything under ${PREFIX} from $${current_gid} to 100..."; \
-	${FIND} -H ${PREFIX} -group $${current_gid} -exec ${CHOWN} :100 {} \; ; \
-	${ECHO_CMD} "chown(1)'ing everything under /var from $${current_uid} to 100..."; \
-	${FIND} -H /var -user $${current_uid} -exec ${CHOWN} 100 {} \; ; \
-	${ECHO_CMD} "chgrp(1)'ing everything under /var from $${current_gid} to 100..."; \
-	${FIND} -H /var -group $${current_gid} -exec ${CHOWN} :100 {} \; ; \
-	${ECHO_CMD} "Finished."
 
 .include <bsd.port.post.mk>
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 223532680f52..b3805d1f82c6 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,9 +1,3 @@
-MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
-SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
-SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
-MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
-SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
-SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
-MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
-SHA256 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 6c98f1f2351b79cfc3f956ed1c46d86c7a53aac0ba28203a33f2dadc7d1e96fe
-SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
+MD5 (squid2.6/squid-2.6.STABLE9.tar.bz2) = 95997d6cb38fdb562ecb790c553f9cfc
+SHA256 (squid2.6/squid-2.6.STABLE9.tar.bz2) = 9cc204d41091642e480277af09872ae36097f9325cf62711d0a8ba125408b7ab
+SIZE (squid2.6/squid-2.6.STABLE9.tar.bz2) = 1263060
diff --git a/www/squid30/files/customlog-2.5.patch b/www/squid30/files/customlog-2.5.patch
deleted file mode 100644
index 3e8c2a542204..000000000000
--- a/www/squid30/files/customlog-2.5.patch
+++ /dev/null
@@ -1,1597 +0,0 @@
-! This patch is sourced from http://devel.squid-cache.org/customlog/
-! Modified diff paths to apply cleanly
-
-Index: src/access_log.c
-diff -u src/access_log.c:1.15.6.8 src/access_log.c:1.15.6.3.2.15
---- src/access_log.c:1.15.6.8	Tue Mar 29 18:17:46 2005
-+++ src/access_log.c	Mon May 15 03:58:22 2006
-@@ -36,9 +36,6 @@
- 
- #include "squid.h"
- 
--static void accessLogSquid(AccessLogEntry * al);
--static void accessLogCommon(AccessLogEntry * al);
--static Logfile *logfile = NULL;
- #if HEADERS_LOG
- static Logfile *headerslog = NULL;
- #endif
-@@ -234,8 +231,768 @@
-     return username_quote(name);
- }
- 
-+static char *
-+log_quoted_string(const char *str)
-+{
-+    char *out = xmalloc(strlen(str) * 2 + 1);
-+    char *p = out;
-+    while (*str) {
-+	int l = strcspn(str, "\"\\\r\n\t");
-+	memcpy(p, str, l);
-+	str += l;
-+	p += l;
-+	switch (*str) {
-+	case '\0':
-+	    break;
-+	case '\r':
-+	    *p++ = '\\';
-+	    *p++ = 'r';
-+	    str++;
-+	    break;
-+	case '\n':
-+	    *p++ = '\\';
-+	    *p++ = 'n';
-+	    str++;
-+	    break;
-+	case '\t':
-+	    *p++ = '\\';
-+	    *p++ = 't';
-+	    str++;
-+	    break;
-+	default:
-+	    *p++ = '\\';
-+	    *p++ = *str;
-+	    str++;
-+	    break;
-+	}
-+    }
-+    *p++ = '\0';
-+    return out;
-+}
-+
-+/*
-+ * Bytecodes for the configureable logformat stuff
-+ */
-+typedef enum {
-+    LFT_NONE,			/* dummy */
-+    LFT_STRING,
-+
-+    LFT_CLIENT_IP_ADDRESS,
-+    LFT_CLIENT_FQDN,
-+/*LFT_CLIENT_PORT, */
-+
-+/*LFT_SERVER_IP_ADDRESS, */
-+    LFT_SERVER_IP_OR_PEER_NAME,
-+/*LFT_SERVER_PORT, */
-+
-+    LFT_LOCAL_IP,
-+    LFT_LOCAL_PORT,
-+/*LFT_LOCAL_NAME, */
-+
-+    LFT_TIME_SECONDS_SINCE_EPOCH,
-+    LFT_TIME_SUBSECOND,
-+    LFT_TIME_LOCALTIME,
-+    LFT_TIME_GMT,
-+    LFT_TIME_TO_HANDLE_REQUEST,
-+
-+    LFT_REQUEST_HEADER,
-+    LFT_REQUEST_HEADER_ELEM,
-+    LFT_REQUEST_ALL_HEADERS,
-+
-+    LFT_REPLY_HEADER,
-+    LFT_REPLY_HEADER_ELEM,
-+    LFT_REPLY_ALL_HEADERS,
-+
-+    LFT_USER_NAME,
-+    LFT_USER_LOGIN,
-+    LFT_USER_IDENT,
-+/*LFT_USER_REALM, */
-+/*LFT_USER_SCHEME, */
-+
-+    LFT_HTTP_CODE,
-+/*LFT_HTTP_STATUS, */
-+
-+    LFT_SQUID_STATUS,
-+/*LFT_SQUID_ERROR, */
-+    LFT_SQUID_HIERARCHY,
-+
-+    LFT_MIME_TYPE,
-+
-+    LFT_REQUEST_METHOD,
-+    LFT_REQUEST_URI,
-+/*LFT_REQUEST_QUERY, * // * this is not needed. see strip_query_terms */
-+    LFT_REQUEST_VERSION,
-+
-+/*LFT_REQUEST_SIZE_TOTAL, */
-+/*LFT_REQUEST_SIZE_LINE, */
-+/*LFT_REQUEST_SIZE_HEADERS, */
-+/*LFT_REQUEST_SIZE_BODY, */
-+/*LFT_REQUEST_SIZE_BODY_NO_TE, */
-+
-+    LFT_REPLY_SIZE_TOTAL,
-+/*LFT_REPLY_SIZE_LINE, */
-+/*LFT_REPLY_SIZE_HEADERS, */
-+/*LFT_REPLY_SIZE_BODY, */
-+/*LFT_REPLY_SIZE_BODY_NO_TE, */
-+
-+#ifdef HAVE_EXTACL_LOG
-+    LFT_EXT_LOG,
-+#endif
-+
-+    LFT_PERCENT			/* special string cases for escaped chars */
-+} logformat_bcode_t;
-+
-+enum log_quote {
-+    LOG_QUOTE_NONE = 0,
-+    LOG_QUOTE_QUOTES,
-+    LOG_QUOTE_BRAKETS,
-+    LOG_QUOTE_URL,
-+    LOG_QUOTE_RAW
-+};
-+struct _logformat_token {
-+    logformat_bcode_t type;
-+    union {
-+	char *string;
-+	struct {
-+	    char *header;
-+	    char *element;
-+	    char separator;
-+	} header;
-+	char *timespec;
-+    } data;
-+    unsigned char width;
-+    unsigned char precision;
-+    enum log_quote quote:3;
-+    unsigned int left:1;
-+    unsigned int space:1;
-+    unsigned int zero:1;
-+    int divisor;
-+    logformat_token *next;	/* todo: move from linked list to array */
-+};
-+
-+struct logformat_token_table_entry {
-+    const char *config;
-+    logformat_bcode_t token_type;
-+    int options;
-+};
-+
-+struct logformat_token_table_entry logformat_token_table[] =
-+{
-+
-+    {">a", LFT_CLIENT_IP_ADDRESS},
-+/*{ ">p", LFT_CLIENT_PORT}, */
-+    {">A", LFT_CLIENT_FQDN},
-+
-+/*{ "<a", LFT_SERVER_IP_ADDRESS }, */
-+/*{ "<p", LFT_SERVER_PORT }, */
-+    {"<A", LFT_SERVER_IP_OR_PEER_NAME},
-+
-+    {"la", LFT_LOCAL_IP},
-+    {"lp", LFT_LOCAL_PORT},
-+/*{ "lA", LFT_LOCAL_NAME }, */
-+
-+    {"ts", LFT_TIME_SECONDS_SINCE_EPOCH},
-+    {"tu", LFT_TIME_SUBSECOND},
-+    {"tl", LFT_TIME_LOCALTIME},
-+    {"tg", LFT_TIME_GMT},
-+    {"tr", LFT_TIME_TO_HANDLE_REQUEST},
-+
-+    {">h", LFT_REQUEST_HEADER},
-+    {"<h", LFT_REPLY_HEADER},
-+
-+    {"un", LFT_USER_NAME},
-+    {"ul", LFT_USER_LOGIN},
-+/*{ "ur", LFT_USER_REALM }, */
-+/*{ "us", LFT_USER_SCHEME }, */
-+    {"ui", LFT_USER_IDENT},
-+
-+    {"Hs", LFT_HTTP_CODE},
-+/*{ "Ht", LFT_HTTP_STATUS }, */
-+
-+    {"Ss", LFT_SQUID_STATUS},
-+/*{ "Se", LFT_SQUID_ERROR }, */
-+    {"Sh", LFT_SQUID_HIERARCHY},
-+
-+    {"mt", LFT_MIME_TYPE},
-+
-+    {"rm", LFT_REQUEST_METHOD},
-+    {"ru", LFT_REQUEST_URI},	/* doesn't include the query-string */
-+/* { "rq", LFT_REQUEST_QUERY }, * /     / * the query-string, INCLUDING the leading ? */
-+    {">v", LFT_REQUEST_VERSION},
-+    {"rv", LFT_REQUEST_VERSION},
-+
-+/*{ ">st", LFT_REQUEST_SIZE_TOTAL }, */
-+/*{ ">sl", LFT_REQUEST_SIZE_LINE }, * / / * the request line "GET ... " */
-+/*{ ">sh", LFT_REQUEST_SIZE_HEADERS }, */
-+/*{ ">sb", LFT_REQUEST_SIZE_BODY }, */
-+/*{ ">sB", LFT_REQUEST_SIZE_BODY_NO_TE }, */
-+
-+    {"<st", LFT_REPLY_SIZE_TOTAL},
-+/*{ "<sl", LFT_REPLY_SIZE_LINE }, * /   / * the reply line (protocol, code, text) */
-+/*{ "<sh", LFT_REPLY_SIZE_HEADERS }, */
-+/*{ "<sb", LFT_REPLY_SIZE_BODY }, */
-+/*{ "<sB", LFT_REPLY_SIZE_BODY_NO_TE }, */
-+
-+#ifdef HAVE_EXTACL_LOG
-+    {"ea", LFT_EXT_LOG},
-+#endif
-+
-+    {"%", LFT_PERCENT},
-+
-+    {NULL, LFT_NONE}		/* this must be last */
-+};
-+
-+static void
-+accessLogCustom(AccessLogEntry * al, customlog * log)
-+{
-+    logformat *lf;
-+    Logfile *logfile;
-+    logformat_token *fmt;
-+    static MemBuf mb = MemBufNULL;
-+    char tmp[1024];
-+    String sb = StringNull;
-+
-+    memBufReset(&mb);
-+
-+    lf = log->logFormat;
-+    logfile = log->logfile;
-+    for (fmt = lf->format; fmt != NULL; fmt = fmt->next) {	/* for each token */
-+	const char *out = NULL;
-+	int quote = 0;
-+	long int outint = 0;
-+	int doint = 0;
-+	int dofree = 0;
-+	switch (fmt->type) {
-+	case LFT_NONE:
-+	    out = "";
-+	    break;
-+	case LFT_STRING:
-+	    out = fmt->data.string;
-+	    break;
-+	case LFT_CLIENT_IP_ADDRESS:
-+	    out = inet_ntoa(al->cache.caddr);
-+	    break;
-+
-+	case LFT_CLIENT_FQDN:
-+	    out = fqdncache_gethostbyaddr(al->cache.caddr, FQDN_LOOKUP_IF_MISS);
-+	    if (!out)
-+		out = inet_ntoa(al->cache.caddr);
-+	    break;
-+
-+	    /* case LFT_CLIENT_PORT: */
-+
-+	    /* case LFT_SERVER_IP_ADDRESS: */
-+
-+	case LFT_SERVER_IP_OR_PEER_NAME:
-+	    out = al->hier.host;
-+	    break;
-+
-+	    /* case LFT_SERVER_PORT: */
-+
-+	case LFT_LOCAL_IP:
-+	    if (al->request)
-+		out = inet_ntoa(al->request->my_addr);
-+	    break;
-+
-+	case LFT_LOCAL_PORT:
-+	    if (al->request) {
-+		outint = al->request->my_port;
-+		doint = 1;
-+	    }
-+	    break;
-+
-+	case LFT_TIME_SECONDS_SINCE_EPOCH:
-+	    outint = current_time.tv_sec;
-+	    doint = 1;
-+	    break;
-+
-+	case LFT_TIME_SUBSECOND:
-+	    outint = current_time.tv_usec / fmt->divisor;
-+	    doint = 1;
-+	    break;
-+
-+
-+	case LFT_TIME_LOCALTIME:
-+	case LFT_TIME_GMT:
-+	    {
-+		const char *spec;
-+		struct tm *t;
-+		spec = fmt->data.timespec;
-+		if (!spec)
-+		    spec = "%d/%b/%Y:%H:%M:%S %z";
-+		if (fmt->type == LFT_TIME_LOCALTIME)
-+		    t = localtime(&squid_curtime);
-+		else
-+		    t = gmtime(&squid_curtime);
-+		strftime(tmp, sizeof(tmp), spec, t);
-+		out = tmp;
-+	    }
-+	    break;
-+
-+	case LFT_TIME_TO_HANDLE_REQUEST:
-+	    outint = al->cache.msec;
-+	    doint = 1;
-+	    break;
-+
-+	case LFT_REQUEST_HEADER:
-+	    if (al->request)
-+		sb = httpHeaderGetByName(&al->request->header, fmt->data.header.header);
-+	    out = strBuf(sb);
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_REPLY_HEADER:
-+	    if (al->reply)
-+		sb = httpHeaderGetByName(&al->reply->header, fmt->data.header.header);
-+	    out = strBuf(sb);
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_REQUEST_HEADER_ELEM:
-+	    if (al->request)
-+		sb = httpHeaderGetByNameListMember(&al->request->header, fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator);
-+	    out = strBuf(sb);
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_REPLY_HEADER_ELEM:
-+	    if (al->reply)
-+		sb = httpHeaderGetByNameListMember(&al->reply->header, fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator);
-+	    out = strBuf(sb);
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_REQUEST_ALL_HEADERS:
-+	    out = al->headers.request;
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_REPLY_ALL_HEADERS:
-+	    out = al->headers.reply;
-+	    quote = 1;
-+	    break;
-+
-+	case LFT_USER_NAME:
-+	    out = accessLogFormatName(al->cache.authuser ?
-+		al->cache.authuser : al->cache.rfc931);
-+	    dofree = 1;
-+	    break;
-+
-+	case LFT_USER_LOGIN:
-+	    out = accessLogFormatName(al->cache.authuser);
-+	    dofree = 1;
-+	    break;
-+
-+	case LFT_USER_IDENT:
-+	    out = accessLogFormatName(al->cache.rfc931);
-+	    dofree = 1;
-+	    break;
-+
-+	    /* case LFT_USER_REALM: */
-+	    /* case LFT_USER_SCHEME: */
-+
-+	case LFT_HTTP_CODE:
-+	    outint = al->http.code;
-+	    doint = 1;
-+	    break;
-+
-+	    /* case LFT_HTTP_STATUS:
-+	     *           out = statusline->text;
-+	     *     quote = 1;
-+	     *     break;
-+	     */
-+
-+	case LFT_SQUID_STATUS:
-+	    out = log_tags[al->cache.code];
-+	    break;
-+
-+	    /* case LFT_SQUID_ERROR: */
-+
-+	case LFT_SQUID_HIERARCHY:
-+	    if (al->hier.ping.timedout)
-+		memBufAppend(&mb, "TIMEOUT_", 8);
-+	    out = hier_strings[al->hier.code];
-+	    break;
-+
-+	case LFT_MIME_TYPE:
-+	    out = al->http.content_type;
-+	    break;
-+
-+	case LFT_REQUEST_METHOD:
-+	    out = al->private.method_str;
-+	    break;
-+
-+	case LFT_REQUEST_URI:
-+	    out = al->url;
-+	    break;
-+
-+	case LFT_REQUEST_VERSION:
-+	    snprintf(tmp, sizeof(tmp), "%d.%d", (int) al->http.version.major, (int) al->http.version.minor);
-+	    out = tmp;
-+	    break;
-+
-+	    /*case LFT_REQUEST_SIZE_TOTAL: */
-+	    /*case LFT_REQUEST_SIZE_LINE: */
-+	    /*case LFT_REQUEST_SIZE_HEADERS: */
-+	    /*case LFT_REQUEST_SIZE_BODY: */
-+	    /*case LFT_REQUEST_SIZE_BODY_NO_TE: */
-+
-+	case LFT_REPLY_SIZE_TOTAL:
-+	    outint = al->cache.size;
-+	    doint = 1;
-+	    break;
-+
-+	    /*case LFT_REPLY_SIZE_LINE: */
-+	    /*case LFT_REPLY_SIZE_HEADERS: */
-+	    /*case LFT_REPLY_SIZE_BODY: */
-+	    /*case LFT_REPLY_SIZE_BODY_NO_TE: */
-+
-+#ifdef HAVE_EXTACL_LOG
-+	case LFT_EXT_LOG:
-+	    if (al->request)
-+		out = strBuf(al->request->extacl_log);
-+
-+	    quote = 1;
-+	    break;
-+#endif
-+
-+	case LFT_PERCENT:
-+	    out = "%";
-+	    break;
-+	}
-+
-+	if (doint) {
-+	    snprintf(tmp, sizeof(tmp), "%0*ld", fmt->zero ? (int) fmt->width : 0, outint);
-+	    out = tmp;
-+	}
-+	if (out && *out) {
-+	    if (quote || fmt->quote != LOG_QUOTE_NONE) {
-+		char *newout = NULL;
-+		int newfree = 0;
-+		switch (fmt->quote) {
-+		case LOG_QUOTE_NONE:
-+		    newout = rfc1738_escape_unescaped(out);
-+		    break;
-+		case LOG_QUOTE_QUOTES:
-+		    newout = log_quoted_string(out);
-+		    newfree = 1;
-+		    break;
-+		case LOG_QUOTE_BRAKETS:
-+		    newout = log_quote(out);
-+		    newfree = 1;
-+		    break;
-+		case LOG_QUOTE_URL:
-+		    newout = rfc1738_escape(out);
-+		    break;
-+		case LOG_QUOTE_RAW:
-+		    break;
-+		}
-+		if (newout) {
-+		    if (dofree)
-+			safe_free(out);
-+		    out = newout;
-+		    dofree = newfree;
-+		}
-+	    }
-+	    if (fmt->width) {
-+		if (fmt->left)
-+		    memBufPrintf(&mb, "%-*s", (int) fmt->width, out);
-+		else
-+		    memBufPrintf(&mb, "%*s", (int) fmt->width, out);
-+	    } else
-+		memBufAppend(&mb, out, strlen(out));
-+	} else {
-+	    memBufAppend(&mb, "-", 1);
-+	}
-+	if (fmt->space)
-+	    memBufAppend(&mb, " ", 1);
-+	stringClean(&sb);
-+	if (dofree)
-+	    safe_free(out);
-+    }
-+    logfilePrintf(logfile, "%s\n", mb.buf);
-+}
-+
-+/* parses a single token. Returns the token length in characters,
-+ * and fills in the lt item with the token information.
-+ * def is for sure null-terminated
-+ */
-+static int
-+accessLogGetNewLogFormatToken(logformat_token * lt, char *def, enum log_quote *quote)
-+{
-+    char *cur = def;
-+    struct logformat_token_table_entry *lte;
-+    int l;
-+
-+    memset(lt, 0, sizeof(*lt));
-+    l = strcspn(cur, "%");
-+    if (l > 0) {
-+	char *cp;
-+	/* it's a string for sure, until \0 or the next % */
-+	cp = xmalloc(l + 1);
-+	xstrncpy(cp, cur, l + 1);
-+	lt->type = LFT_STRING;
-+	lt->data.string = cp;
-+	while (l > 0) {
-+	    switch (*cur) {
-+	    case '"':
-+		if (*quote == LOG_QUOTE_NONE)
-+		    *quote = LOG_QUOTE_QUOTES;
-+		else if (*quote == LOG_QUOTE_QUOTES)
-+		    *quote = LOG_QUOTE_NONE;
-+		break;
-+	    case '[':
-+		if (*quote == LOG_QUOTE_NONE)
-+		    *quote = LOG_QUOTE_BRAKETS;
-+		break;
-+	    case ']':
-+		if (*quote == LOG_QUOTE_BRAKETS)
-+		    *quote = LOG_QUOTE_NONE;
-+		break;
-+	    }
-+	    cur++;
-+	    l--;
-+	}
-+	goto done;
-+    }
-+    if (!*cur)
-+	goto done;
-+    cur++;
-+    switch (*cur) {
-+    case '"':
-+	lt->quote = LOG_QUOTE_QUOTES;
-+	cur++;
-+	break;
-+    case '\'':
-+	lt->quote = LOG_QUOTE_RAW;
-+	cur++;
-+	break;
-+    case '[':
-+	lt->quote = LOG_QUOTE_BRAKETS;
-+	cur++;
-+	break;
-+    case '#':
-+	lt->quote = LOG_QUOTE_URL;
-+	cur++;
-+	break;
-+    default:
-+	lt->quote = *quote;
-+	break;
-+    }
-+    if (*cur == '-') {
-+	lt->left = 1;
-+	cur++;
-+    }
-+    if (*cur == '0') {
-+	lt->zero = 1;
-+	cur++;
-+    }
-+    if (isdigit(*cur))
-+	lt->width = strtol(cur, &cur, 10);
-+    if (*cur == '.')
-+	lt->precision = strtol(cur + 1, &cur, 10);
-+    if (*cur == '{') {
-+	char *cp;
-+	cur++;
-+	l = strcspn(cur, "}");
-+	cp = xmalloc(l + 1);
-+	xstrncpy(cp, cur, l + 1);
-+	lt->data.string = cp;
-+	cur += l;
-+	if (*cur == '}')
-+	    cur++;
-+    }
-+    lt->type = LFT_NONE;
-+    for (lte = logformat_token_table; lte->config != NULL; lte++) {
-+	if (strncmp(lte->config, cur, strlen(lte->config)) == 0) {
-+	    lt->type = lte->token_type;
-+	    cur += strlen(lte->config);
-+	    break;
-+	}
-+    }
-+    if (lt->type == LFT_NONE) {
-+	fatalf("Can't parse configuration token: '%s'\n",
-+	    def);
-+    }
-+    if (*cur == ' ') {
-+	lt->space = 1;
-+	cur++;
-+    }
-+  done:
-+    switch (lt->type) {
-+    case LFT_REQUEST_HEADER:
-+    case LFT_REPLY_HEADER:
-+	if (lt->data.string) {
-+	    char *header = lt->data.string;
-+	    char *cp = strchr(header, ':');
-+	    if (cp) {
-+		*cp++ = '\0';
-+		if (*cp == ',' || *cp == ';' || *cp == ':')
-+		    lt->data.header.separator = *cp++;
-+		else
-+		    lt->data.header.separator = ',';
-+		lt->data.header.element = cp;
-+		lt->type = (lt->type == LFT_REQUEST_HEADER) ?
-+		    LFT_REQUEST_HEADER_ELEM :
-+		    LFT_REPLY_HEADER_ELEM;
-+	    }
-+	    lt->data.header.header = header;
-+	} else {
-+	    lt->type = (lt->type == LFT_REQUEST_HEADER) ?
-+		LFT_REQUEST_ALL_HEADERS :
-+		LFT_REPLY_ALL_HEADERS;
-+	    Config.onoff.log_mime_hdrs = 1;
-+	}
-+	break;
-+    case LFT_CLIENT_FQDN:
-+	Config.onoff.log_fqdn = 1;
-+	break;
-+    case LFT_TIME_SUBSECOND:
-+	lt->divisor = 1000;
-+	if (lt->precision) {
-+	    int i;
-+	    lt->divisor = 1000000;
-+	    for (i = lt->precision; i > 1; i--)
-+		lt->divisor /= 10;
-+	    if (!lt->divisor)
-+		lt->divisor = 0;
-+	}
-+	break;
-+    default:
-+	break;
-+    }
-+    return (cur - def);
-+}
-+
-+int
-+accessLogParseLogFormat(logformat_token ** fmt, char *def)
-+{
-+    char *cur, *eos;
-+    logformat_token *new_lt, *last_lt;
-+    enum log_quote quote = LOG_QUOTE_NONE;
-+
-+    debug(46, 1) ("accessLogParseLogFormat: got definition '%s'\n", def);
-+
-+    /* very inefficent parser, but who cares, this needs to be simple */
-+    /* First off, let's tokenize, we'll optimize in a second pass.
-+     * A token can either be a %-prefixed sequence (usually a dynamic
-+     * token but it can be an escaped sequence), or a string. */
-+    cur = def;
-+    eos = def + strlen(def);
-+    *fmt = new_lt = last_lt = xmalloc(sizeof(logformat_token));
-+    cur += accessLogGetNewLogFormatToken(new_lt, cur, &quote);
-+    while (cur < eos) {
-+	new_lt = xmalloc(sizeof(logformat_token));
-+	last_lt->next = new_lt;
-+	last_lt = new_lt;
-+	cur += accessLogGetNewLogFormatToken(new_lt, cur, &quote);
-+    }
-+    return 1;
-+}
-+
-+void
-+accessLogDumpLogFormat(StoreEntry * entry, const char *name, logformat * definitions)
-+{
-+    logformat_token *t;
-+    logformat *format;
-+    struct logformat_token_table_entry *te;
-+    debug(46, 0) ("accessLogDumpLogFormat called\n");
-+
-+    for (format = definitions; format; format = format->next) {
-+	debug(46, 0) ("Dumping logformat definition for %s\n", format->name);
-+	storeAppendPrintf(entry, "logformat %s ", format->name);
-+	for (t = format->format; t; t = t->next) {
-+	    if (t->type == LFT_STRING)
-+		storeAppendPrintf(entry, "%s", t->data.string);
-+	    else {
-+		char argbuf[256];
-+		char *arg = NULL;
-+		logformat_bcode_t type = t->type;
-+
-+		switch (type) {
-+		    /* special cases */
-+		case LFT_STRING:
-+		    break;
-+		case LFT_REQUEST_HEADER_ELEM:
-+		case LFT_REPLY_HEADER_ELEM:
-+		    if (t->data.header.separator != ',')
-+			snprintf(argbuf, sizeof(argbuf), "%s:%c%s", t->data.header.header, t->data.header.separator, t->data.header.element);
-+		    else
-+			snprintf(argbuf, sizeof(argbuf), "%s:%s", t->data.header.header, t->data.header.element);
-+
-+		    arg = argbuf;
-+		    type = (type == LFT_REQUEST_HEADER_ELEM) ?
-+			LFT_REQUEST_HEADER :
-+			LFT_REPLY_HEADER;
-+		    break;
-+
-+		case LFT_REQUEST_ALL_HEADERS:
-+		case LFT_REPLY_ALL_HEADERS:
-+		    type = (type == LFT_REQUEST_ALL_HEADERS) ?
-+			LFT_REQUEST_HEADER :
-+			LFT_REPLY_HEADER;
-+		    break;
-+
-+		default:
-+		    if (t->data.string)
-+			arg = t->data.string;
-+		    break;
-+		}
-+		storeAppend(entry, "%", 1);
-+		switch (t->quote) {
-+		case LOG_QUOTE_QUOTES:
-+		    storeAppend(entry, "\"", 1);
-+		    break;
-+		case LOG_QUOTE_BRAKETS:
-+		    storeAppend(entry, "[", 1);
-+		    break;
-+		case LOG_QUOTE_URL:
-+		    storeAppend(entry, "#", 1);
-+		    break;
-+		case LOG_QUOTE_RAW:
-+		    storeAppend(entry, "'", 1);
-+		    break;
-+		case LOG_QUOTE_NONE:
-+		    break;
-+		}
-+		if (t->left)
-+		    storeAppend(entry, "-", 1);
-+		if (t->zero)
-+		    storeAppend(entry, "0", 1);
-+		if (t->width)
-+		    storeAppendPrintf(entry, "%d", (int) t->width);
-+		if (t->precision)
-+		    storeAppendPrintf(entry, ".%d", (int) t->precision);
-+		if (arg)
-+		    storeAppendPrintf(entry, "{%s}", arg);
-+		for (te = logformat_token_table; te->config != NULL; te++) {
-+		    if (te->token_type == t->type) {
-+			storeAppendPrintf(entry, "%s", te->config);
-+			break;
-+		    }
-+		}
-+		if (t->space)
-+		    storeAppend(entry, " ", 1);
-+		assert(te->config != NULL);
-+	    }
-+	}
-+    }
-+    storeAppend(entry, "\n", 1);
-+}
-+
-+void
-+accessLogFreeLogFormat(logformat_token ** tokens)
-+{
-+    while (*tokens) {
-+	logformat_token *token = *tokens;
-+	*tokens = token->next;
-+	safe_free(token->data.string);
-+	xfree(token);
-+    }
-+}
-+
- static void
--accessLogSquid(AccessLogEntry * al)
-+accessLogSquid(AccessLogEntry * al, Logfile * logfile)
- {
-     const char *client = NULL;
-     char *user = NULL;
-@@ -261,10 +1018,19 @@
- 	al->hier.host,
- 	al->http.content_type);
-     safe_free(user);
-+    if (Config.onoff.log_mime_hdrs) {
-+	char *ereq = log_quote(al->headers.request);
-+	char *erep = log_quote(al->headers.reply);
-+	logfilePrintf(logfile, " [%s] [%s]\n", ereq, erep);
-+	safe_free(ereq);
-+	safe_free(erep);
-+    } else {
-+	logfilePrintf(logfile, "\n");
-+    }
- }
- 
- static void
--accessLogCommon(AccessLogEntry * al)
-+accessLogCommon(AccessLogEntry * al, Logfile * logfile)
- {
-     const char *client = NULL;
-     char *user1 = NULL, *user2 = NULL;
-@@ -288,11 +1054,21 @@
- 	hier_strings[al->hier.code]);
-     safe_free(user1);
-     safe_free(user2);
-+    if (Config.onoff.log_mime_hdrs) {
-+	char *ereq = log_quote(al->headers.request);
-+	char *erep = log_quote(al->headers.reply);
-+	logfilePrintf(logfile, " [%s] [%s]\n", ereq, erep);
-+	safe_free(ereq);
-+	safe_free(erep);
-+    } else {
-+	logfilePrintf(logfile, "\n");
-+    }
- }
- 
- void
--accessLogLog(AccessLogEntry * al)
-+accessLogLog(AccessLogEntry * al, aclCheck_t * checklist)
- {
-+    customlog *log;
-     if (LogfileStatus != LOG_ENABLE)
- 	return;
-     if (al->url == NULL)
-@@ -306,20 +1082,38 @@
-     if (al->hier.host[0] == '\0')
- 	xstrncpy(al->hier.host, dash_str, SQUIDHOSTNAMELEN);
- 
--    if (Config.onoff.common_log)
--	accessLogCommon(al);
--    else
--	accessLogSquid(al);
--    if (Config.onoff.log_mime_hdrs) {
--	char *ereq = log_quote(al->headers.request);
--	char *erep = log_quote(al->headers.reply);
--	logfilePrintf(logfile, " [%s] [%s]\n", ereq, erep);
--	safe_free(ereq);
--	safe_free(erep);
--    } else {
--	logfilePrintf(logfile, "\n");
-+    for (log = Config.Log.accesslogs; log; log = log->next) {
-+	if (checklist && log->aclList && aclMatchAclList(log->aclList, checklist) != 1)
-+	    continue;
-+	switch (log->type) {
-+	case CLF_AUTO:
-+	    if (Config.onoff.common_log)
-+		accessLogCommon(al, log->logfile);
-+	    else
-+		accessLogSquid(al, log->logfile);
-+	    break;
-+	case CLF_SQUID:
-+	    accessLogSquid(al, log->logfile);
-+	    break;
-+	case CLF_COMMON:
-+	    accessLogCommon(al, log->logfile);
-+	    break;
-+	case CLF_CUSTOM:
-+	    accessLogCustom(al, log);
-+	    break;
-+	case CLF_NONE:
-+	    goto last;
-+	default:
-+	    fatalf("Unknown log format %d\n", log->type);
-+	    break;
-+	}
-+	logfileFlush(log->logfile);
-+	if (!checklist)
-+	    break;
-     }
--    logfileFlush(logfile);
-+  last:
-+    (void) 0;			/* NULL statement for label */
-+
- #if MULTICAST_MISS_STREAM
-     if (al->cache.code != LOG_TCP_MISS)
- 	(void) 0;
-@@ -346,12 +1140,15 @@
- void
- accessLogRotate(void)
- {
-+    customlog *log;
- #if FORW_VIA_DB
-     fvdbClear();
- #endif
--    if (NULL == logfile)
--	return;
--    logfileRotate(logfile);
-+    for (log = Config.Log.accesslogs; log; log = log->next) {
-+	if (log->logfile) {
-+	    logfileRotate(log->logfile);
-+	}
-+    }
- #if HEADERS_LOG
-     logfileRotate(headerslog);
- #endif
-@@ -360,10 +1157,13 @@
- void
- accessLogClose(void)
- {
--    if (NULL == logfile)
--	return;
--    logfileClose(logfile);
--    logfile = NULL;
-+    customlog *log;
-+    for (log = Config.Log.accesslogs; log; log = log->next) {
-+	if (log->logfile) {
-+	    logfileClose(log->logfile);
-+	    log->logfile = NULL;
-+	}
-+    }
- #if HEADERS_LOG
-     logfileClose(headerslog);
-     headerslog = NULL;
-@@ -383,11 +1183,14 @@
- void
- accessLogInit(void)
- {
-+    customlog *log;
-     assert(sizeof(log_tags) == (LOG_TYPE_MAX + 1) * sizeof(char *));
--    if (strcasecmp(Config.Log.access, "none") == 0)
--	return;
--    logfile = logfileOpen(Config.Log.access, MAX_URL << 1, 1);
--    LogfileStatus = LOG_ENABLE;
-+    for (log = Config.Log.accesslogs; log; log = log->next) {
-+	if (log->type == CLF_NONE)
-+	    continue;
-+	log->logfile = logfileOpen(log->filename, MAX_URL << 1, 1);
-+	LogfileStatus = LOG_ENABLE;
-+    }
- #if HEADERS_LOG
-     headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0);
-     assert(NULL != headerslog);
-Index: src/cache_cf.c
-diff -u src/cache_cf.c:1.38.6.29 src/cache_cf.c:1.38.6.11.4.10
---- src/cache_cf.c:1.38.6.29	Wed Oct 26 19:13:24 2005
-+++ src/cache_cf.c	Fri Mar  3 18:27:50 2006
-@@ -60,6 +60,14 @@
- static void dump_cachedir_option_readonly(StoreEntry * e, const char *option, SwapDir * sd);
- static void parse_cachedir_option_maxsize(SwapDir * sd, const char *option, const char *value, int reconfiguring);
- static void dump_cachedir_option_maxsize(StoreEntry * e, const char *option, SwapDir * sd);
-+static void parse_logformat(logformat ** logformat_definitions);
-+static void parse_access_log(customlog ** customlog_definitions);
-+static void dump_logformat(StoreEntry * entry, const char *name, logformat * definitions);
-+static void dump_access_log(StoreEntry * entry, const char *name, customlog * definitions);
-+static void free_logformat(logformat ** definitions);
-+static void free_access_log(customlog ** definitions);
-+
-+
- static struct cache_dir_option common_cachedir_options[] =
- {
-     {"read-only", parse_cachedir_option_readonly, dump_cachedir_option_readonly},
-@@ -2625,3 +2633,144 @@
- 	return t;
-     }
- }
-+
-+static void
-+parse_logformat(logformat ** logformat_definitions)
-+{
-+    logformat *nlf;
-+    char *name, *def;
-+
-+    if ((name = strtok(NULL, w_space)) == NULL)
-+	self_destruct();
-+    if ((def = strtok(NULL, "\r\n")) == NULL)
-+	self_destruct();
-+
-+    debug(3, 1) ("Logformat for '%s' is '%s'\n", name, def);
-+
-+    nlf = xcalloc(1, sizeof(logformat));
-+    nlf->name = xstrdup(name);
-+    if (!accessLogParseLogFormat(&nlf->format, def))
-+	self_destruct();
-+    nlf->next = *logformat_definitions;
-+    *logformat_definitions = nlf;
-+}
-+
-+static void
-+parse_access_log(customlog ** logs)
-+{
-+    const char *filename, *logdef_name;
-+    customlog *cl;
-+    logformat *lf;
-+
-+    cl = xcalloc(1, sizeof(*cl));
-+
-+    if ((filename = strtok(NULL, w_space)) == NULL)
-+	self_destruct();
-+
-+    if (strcmp(filename, "none") == 0) {
-+	cl->type = CLF_NONE;
-+	goto done;
-+    }
-+    if ((logdef_name = strtok(NULL, w_space)) == NULL)
-+	logdef_name = "auto";
-+
-+    debug(3, 9) ("Log definition name '%s' file '%s'\n", logdef_name, filename);
-+
-+    cl->filename = xstrdup(filename);
-+
-+    /* look for the definition pointer corresponding to this name */
-+    lf = Config.Log.logformats;
-+    while (lf != NULL) {
-+	debug(3, 9) ("Comparing against '%s'\n", lf->name);
-+	if (strcmp(lf->name, logdef_name) == 0)
-+	    break;
-+	lf = lf->next;
-+    }
-+    if (lf != NULL) {
-+	cl->type = CLF_CUSTOM;
-+	cl->logFormat = lf;
-+    } else if (strcmp(logdef_name, "auto") == 0) {
-+	cl->type = CLF_AUTO;
-+    } else if (strcmp(logdef_name, "squid") == 0) {
-+	cl->type = CLF_SQUID;
-+    } else if (strcmp(logdef_name, "common") == 0) {
-+	cl->type = CLF_COMMON;
-+    } else {
-+	debug(3, 0) ("Log format '%s' is not defined\n", logdef_name);
-+	self_destruct();
-+    }
-+
-+  done:
-+    aclParseAclList(&cl->aclList);
-+
-+    while (*logs)
-+	logs = &(*logs)->next;
-+    *logs = cl;
-+}
-+
-+static void
-+dump_logformat(StoreEntry * entry, const char *name, logformat * definitions)
-+{
-+    accessLogDumpLogFormat(entry, name, definitions);
-+}
-+
-+static void
-+dump_access_log(StoreEntry * entry, const char *name, customlog * logs)
-+{
-+    customlog *log;
-+    for (log = logs; log; log = log->next) {
-+	storeAppendPrintf(entry, "%s ", name);
-+	switch (log->type) {
-+	case CLF_CUSTOM:
-+	    storeAppendPrintf(entry, "%s %s", log->filename, log->logFormat->name);
-+	    break;
-+	case CLF_NONE:
-+	    storeAppendPrintf(entry, "none");
-+	    break;
-+	case CLF_SQUID:
-+	    storeAppendPrintf(entry, "%s squid", log->filename);
-+	    break;
-+	case CLF_COMMON:
-+	    storeAppendPrintf(entry, "%s squid", log->filename);
-+	    break;
-+	case CLF_AUTO:
-+	    if (log->aclList)
-+		storeAppendPrintf(entry, "%s auto", log->filename);
-+	    else
-+		storeAppendPrintf(entry, "%s", log->filename);
-+	    break;
-+	case CLF_UNKNOWN:
-+	    break;
-+	}
-+	if (log->aclList)
-+	    dump_acl_list(entry, log->aclList);
-+	storeAppendPrintf(entry, "\n");
-+    }
-+}
-+
-+static void
-+free_logformat(logformat ** definitions)
-+{
-+    while (*definitions) {
-+	logformat *format = *definitions;
-+	*definitions = format->next;
-+	accessLogFreeLogFormat(&format->format);
-+	xfree(format);
-+    }
-+}
-+
-+static void
-+free_access_log(customlog ** definitions)
-+{
-+    while (*definitions) {
-+	customlog *log = *definitions;
-+	*definitions = log->next;
-+
-+	log->logFormat = NULL;
-+	log->type = CLF_UNKNOWN;
-+	if (log->aclList)
-+	    aclDestroyAclList(&log->aclList);
-+	safe_free(log->filename);
-+	xfree(log);
-+    }
-+}
-Index: src/cf.data.pre
-diff -u src/cf.data.pre:1.49.2.86 src/cf.data.pre:1.49.2.40.2.18
---- src/cf.data.pre:1.49.2.86	Sat Feb 25 19:13:57 2006
-+++ src/cf.data.pre	Fri Mar  3 18:27:50 2006
-@@ -834,16 +834,97 @@
- 	(hard coded at 1 MB).
- DOC_END
- 
--
--NAME: cache_access_log
--TYPE: string
--DEFAULT: @DEFAULT_ACCESS_LOG@
--LOC: Config.Log.access
-+NAME: logformat
-+TYPE: logformat
-+LOC: Config.Log.logformats
-+DEFAULT: none
- DOC_START
--	Logs the client request activity.  Contains an entry for
--	every HTTP and ICP queries received. To disable, enter "none".
--DOC_END
-+	Usage:
-+
-+	logformat <name> <format specification>
-+
-+	Defines an access log format.
-+
-+	The <format specification> is a string with embedded % format codes
-+	
-+	% format codes all follow the same basic structure where all but
-+	the formatcode is optional. Output strings are automatically escaped
-+	as required according to their context and the output format
-+	modifiers are usually not needed, but can be specified if an explicit
-+	output format is desired.
-+
-+		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-+	
-+		"	output in quoted string format
-+		[	output in squid text log format as used by log_mime_hdrs
-+		#	output in URL quoted format
-+		'	output as-is
-+
-+		-	left aligned
-+		width	field width. If starting with 0 then the
-+			output is zero padded
-+		{arg}	argument such as header name etc
-+
-+	Format codes:
-+
-+		>a	Client source IP address
-+		>A	Client FQDN
-+		<A	Server IP address or peer name
-+		la	Local IP address (http_port)
-+		lp	Local port number (http_port)
-+		ts	Seconds since epoch
-+		tu	subsecond time (milliseconds)
-+		tl	Local time. Optional strftime format argument
-+			default %d/%b/%Y:%H:%M:%S %z
-+		tg	GMT time. Optional strftime format argument
-+			default %d/%b/%Y:%H:%M:%S %z
-+		tr	Response time (milliseconds)
-+		>h	Request header. Optional header name argument
-+			on the format header[:[separator]element]
-+		<h	Reply header. Optional header name argument
-+			as for >h
-+		un	User name
-+		ul	User login
-+		ui	User ident
-+		Hs	HTTP status code
-+		Ss	Squid request status (TCP_MISS etc)
-+		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
-+		mt	MIME content type
-+		rm	Request method (GET/POST etc)
-+		ru	Request URL
-+		rv	Request protocol version
-+		ea	Log string returned by external acl
-+		<st	Reply size including HTTP headers
-+		%	a literal % character
-+
-+logformat squid  %ts.%03tu %6tr %>a %Ss/%03Hs %<st %rm %ru %un %Sh/%<A %mt
-+logformat squidmime  %ts.%03tu %6tr %>a %Ss/%03Hs %<st %rm %ru %un %Sh/%<A %mt [%>h] [%<h]
-+logformat common %>a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %<st %Ss:%Sh
-+logformat combined %>a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-+DOC_END
-+
-+NAME: access_log cache_access_log
-+TYPE: access_log
-+LOC: Config.Log.accesslogs
-+DEFAULT: none
-+DOC_START
-+  These files log client request activities. Has a line every HTTP or
-+  ICP request. The format is:
-+  access_log <filepath> [<logformat name> [acl acl ...]]
-+
-+  Will log to the specified file using the specified format (which
-+  must be defined in a logformat directive) those entries which match
-+  ALL the acl's specified (which must be defined in acl clauses).
-+  If no acl is specified, all requests will be logged to this file.
-+  
-+  To disable logging of a request use the filepath "none", in which case
-+  a logformat name should not be specified.
- 
-+  To log the request via syslog specify a filepath of "syslog"
-+NOCOMMENT_START
-+access_log @DEFAULT_ACCESS_LOG@ squid
-+NOCOMMENT_END
-+DOC_END
- 
- NAME: cache_log
- TYPE: string
-@@ -2440,6 +2521,17 @@
- 	no limit imposed.
- DOC_END
- 
-+NAME: log_access
-+TYPE: acl_access
-+LOC: Config.accessList.log
-+DEFAULT: none
-+COMMENT: allow|deny acl acl...
-+DOC_START
-+        This options allows you to control which requests gets logged
-+	to access.log (see cache_access_log directive). Requests denied
-+	for logging will also not be accounted for in performance counters.
-+DOC_END
-+
- COMMENT_START
-  ADMINISTRATIVE PARAMETERS
-  -----------------------------------------------------------------------------
-Index: src/client_side.c
-diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15
---- src/client_side.c:1.47.2.76	Fri Mar 10 19:16:31 2006
-+++ src/client_side.c	Mon Apr 24 08:22:33 2006
-@@ -871,14 +871,18 @@
- 	http->al.cache.code = http->log_type;
- 	http->al.cache.msec = tvSubMsec(http->start, current_time);
- 	if (request) {
--	    Packer p;
--	    MemBuf mb;
--	    memBufDefInit(&mb);
--	    packerToMemInit(&p, &mb);
--	    httpHeaderPackInto(&request->header, &p);
-+	    if (Config.onoff.log_mime_hdrs) {
-+		Packer p;
-+		MemBuf mb;
-+		memBufDefInit(&mb);
-+		packerToMemInit(&p, &mb);
-+		httpHeaderPackInto(&request->header, &p);
-+		http->al.headers.request = xstrdup(mb.buf);
-+		packerClean(&p);
-+		memBufClean(&mb);
-+	    }
- 	    http->al.http.method = request->method;
- 	    http->al.http.version = request->http_ver;
--	    http->al.headers.request = xstrdup(mb.buf);
- 	    http->al.hier = request->hier;
- 	    if (request->auth_user_request) {
- 		if (authenticateUserRequestUsername(request->auth_user_request))
-@@ -888,12 +892,17 @@
- 	    }
- 	    if (conn->rfc931[0])
- 		http->al.cache.rfc931 = conn->rfc931;
--	    packerClean(&p);
--	    memBufClean(&mb);
- 	}
--	accessLogLog(&http->al);
--	clientUpdateCounters(http);
--	clientdbUpdate(conn->peer.sin_addr, http->log_type, PROTO_HTTP, http->out.size);
-+	http->al.request = request;
-+	if (!http->acl_checklist)
-+	    http->acl_checklist = clientAclChecklistCreate(Config.accessList.http, http);
-+	http->acl_checklist->reply = http->reply;
-+	if (!Config.accessList.log || aclCheckFast(Config.accessList.log, http->acl_checklist)) {
-+	    http->al.reply = http->reply;
-+	    accessLogLog(&http->al, http->acl_checklist);
-+	    clientUpdateCounters(http);
-+	    clientdbUpdate(conn->peer.sin_addr, http->log_type, PROTO_HTTP, http->out.size);
-+	}
-     }
-     if (http->acl_checklist)
- 	aclChecklistFree(http->acl_checklist);
-@@ -904,6 +913,7 @@
-     safe_free(http->al.headers.request);
-     safe_free(http->al.headers.reply);
-     safe_free(http->al.cache.authuser);
-+    http->al.request = NULL;
-     safe_free(http->redirect.location);
-     stringClean(&http->range_iter.boundary);
-     if ((e = http->entry)) {
-Index: src/icp_v2.c
-diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1
---- src/icp_v2.c:1.5	Fri May  4 06:39:12 2001
-+++ src/icp_v2.c	Sat Jun 21 05:45:26 2003
-@@ -63,7 +63,7 @@
-     al.cache.size = len;
-     al.cache.code = logcode;
-     al.cache.msec = delay;
--    accessLogLog(&al);
-+    accessLogLog(&al, NULL);
- }
- 
- void
-Index: src/logfile.c
-diff -u src/logfile.c:1.5.38.3 src/logfile.c:1.5.38.3.4.4
---- src/logfile.c:1.5.38.3	Mon Jan 20 19:15:11 2003
-+++ src/logfile.c	Sun May 21 16:56:52 2006
-@@ -36,36 +36,127 @@
- 
- static void logfileWriteWrapper(Logfile * lf, const void *buf, size_t len);
- 
-+#if HAVE_SYSLOG
-+typedef struct {
-+    const char *name;
-+    int value;
-+}syslog_symbol_t;
-+
-+static int 
-+syslog_ntoa(const char *s)
-+{
-+#define syslog_symbol(a) #a, a
-+    static syslog_symbol_t symbols[] =
-+    {
-+#ifdef LOG_AUTHPRIV
-+	{syslog_symbol(LOG_AUTHPRIV)},
-+#endif
-+#ifdef LOG_DAEMON
-+	{syslog_symbol(LOG_DAEMON)},
-+#endif
-+#ifdef LOG_LOCAL0
-+	{syslog_symbol(LOG_LOCAL0)},
-+#endif
-+#ifdef LOG_LOCAL1
-+	{syslog_symbol(LOG_LOCAL1)},
-+#endif
-+#ifdef LOG_LOCAL2
-+	{syslog_symbol(LOG_LOCAL2)},
-+#endif
-+#ifdef LOG_LOCAL3
-+	{syslog_symbol(LOG_LOCAL3)},
-+#endif
-+#ifdef LOG_LOCAL4
-+	{syslog_symbol(LOG_LOCAL4)},
-+#endif
-+#ifdef LOG_LOCAL5
-+	{syslog_symbol(LOG_LOCAL5)},
-+#endif
-+#ifdef LOG_LOCAL6
-+	{syslog_symbol(LOG_LOCAL6)},
-+#endif
-+#ifdef LOG_LOCAL7
-+	{syslog_symbol(LOG_LOCAL7)},
-+#endif
-+#ifdef LOG_USER
-+	{syslog_symbol(LOG_USER)},
-+#endif
-+#ifdef LOG_ERR
-+	{syslog_symbol(LOG_ERR)},
-+#endif
-+#ifdef LOG_WARNING
-+	{syslog_symbol(LOG_WARNING)},
-+#endif
-+#ifdef LOG_NOTICE
-+	{syslog_symbol(LOG_NOTICE)},
-+#endif
-+#ifdef LOG_INFO
-+	{syslog_symbol(LOG_INFO)},
-+#endif
-+#ifdef LOG_DEBUG
-+	{syslog_symbol(LOG_DEBUG)},
-+#endif
-+	{NULL, 0}
-+    };
-+    syslog_symbol_t *p;
-+
-+    for (p = symbols; p->name != NULL; ++p)
-+	if (!strcmp(s, p->name) || !strcmp(s, p->name + 4))
-+	    return p->value;
-+    return 0;
-+}
-+
-+#define PRIORITY_MASK (LOG_ERR | LOG_WARNING | LOG_NOTICE | LOG_INFO | LOG_DEBUG)
-+#endif /* HAVE_SYSLOG */
-+
- Logfile *
- logfileOpen(const char *path, size_t bufsz, int fatal_flag)
- {
--    int fd;
--    Logfile *lf;
--    fd = file_open(path, O_WRONLY | O_CREAT | O_TEXT);
--    if (DISK_ERROR == fd) {
--	if (ENOENT == errno && fatal_flag) {
--	    fatalf("Cannot open '%s' because\n"
--		"\tthe parent directory does not exist.\n"
--		"\tPlease create the directory.\n", path);
--	} else if (EACCES == errno && fatal_flag) {
--	    fatalf("Cannot open '%s' for writing.\n"
--		"\tThe parent directory must be writeable by the\n"
--		"\tuser '%s', which is the cache_effective_user\n"
--		"\tset in squid.conf.", path, Config.effectiveUser);
--	} else {
--	    debug(50, 1) ("logfileOpen: %s: %s\n", path, xstrerror());
--	    return NULL;
-+    Logfile *lf = xcalloc(1, sizeof(*lf));
-+    xstrncpy(lf->path, path, MAXPATHLEN);
-+#if HAVE_SYSLOG
-+    if (strcmp(path, "syslog") == 0 || strncmp(path, "syslog:", 7) == 0) {
-+	lf->flags.syslog = 1;
-+	lf->fd = -1;
-+	if (path[6] != '\0') {
-+	    const char *priority = path + 7;
-+	    char *facility = strchr(priority, '|');
-+	    if (facility) {
-+		*facility++ = '\0';
-+		lf->syslog_priority |= syslog_ntoa(facility);
-+	    }
-+	    lf->syslog_priority |= syslog_ntoa(priority);
-+	}
-+	if ((lf->syslog_priority & PRIORITY_MASK) == 0)
-+	    lf->syslog_priority |= LOG_INFO;
-+    } else
-+#endif
-+    {
-+	int fd = file_open(path, O_WRONLY | O_CREAT | O_TEXT);
-+	if (DISK_ERROR == fd) {
-+	    if (ENOENT == errno && fatal_flag) {
-+		fatalf("Cannot open '%s' because\n"
-+		    "\tthe parent directory does not exist.\n"
-+		    "\tPlease create the directory.\n", path);
-+	    } else if (EACCES == errno && fatal_flag) {
-+		fatalf("Cannot open '%s' for writing.\n"
-+		    "\tThe parent directory must be writeable by the\n"
-+		    "\tuser '%s', which is the cache_effective_user\n"
-+		    "\tset in squid.conf.", path, Config.effectiveUser);
-+	    } else {
-+		debug(50, 1) ("logfileOpen: %s: %s\n", path, xstrerror());
-+		safe_free(lf);
-+		return NULL;
-+	    }
-+	}
-+	lf->fd = fd;
-+	if (bufsz > 0) {
-+	    lf->buf = xmalloc(bufsz);
-+	    lf->bufsz = bufsz;
- 	}
-     }
--    lf = xcalloc(1, sizeof(*lf));
--    lf->fd = fd;
-     if (fatal_flag)
- 	lf->flags.fatal = 1;
--    xstrncpy(lf->path, path, MAXPATHLEN);
--    if (bufsz > 0) {
--	lf->buf = xmalloc(bufsz);
--	lf->bufsz = bufsz;
--    }
-     return lf;
- }
- 
-@@ -73,7 +164,8 @@
- logfileClose(Logfile * lf)
- {
-     logfileFlush(lf);
--    file_close(lf->fd);
-+    if (lf->fd >= 0)
-+	file_close(lf->fd);
-     if (lf->buf)
- 	xfree(lf->buf);
-     xfree(lf);
-@@ -89,6 +181,8 @@
-     char from[MAXPATHLEN];
-     char to[MAXPATHLEN];
-     assert(lf->path);
-+    if (lf->flags.syslog)
-+	return;
- #ifdef S_ISREG
-     if (stat(lf->path, &sb) == 0)
- 	if (S_ISREG(sb.st_mode) == 0)
-@@ -120,6 +214,12 @@
- void
- logfileWrite(Logfile * lf, void *buf, size_t len)
- {
-+#if HAVE_SYSLOG
-+    if (lf->flags.syslog) {
-+	syslog(lf->syslog_priority, "%s", (char *) buf);
-+	return;
-+    }
-+#endif
-     if (0 == lf->bufsz) {
- 	/* buffering disabled */
- 	logfileWriteWrapper(lf, buf, len);
-Index: src/protos.h
-diff -u src/protos.h:1.41.6.34 src/protos.h:1.41.6.14.2.10
---- src/protos.h:1.41.6.34	Sat Feb 25 19:13:57 2006
-+++ src/protos.h	Fri Mar  3 18:27:52 2006
-@@ -34,11 +34,14 @@
- #ifndef SQUID_PROTOS_H
- #define SQUID_PROTOS_H
- 
--extern void accessLogLog(AccessLogEntry *);
-+extern void accessLogLog(AccessLogEntry *, aclCheck_t * checklist);
- extern void accessLogRotate(void);
- extern void accessLogClose(void);
- extern void accessLogInit(void);
- extern const char *accessLogTime(time_t);
-+extern int accessLogParseLogFormat(logformat_token ** fmt, char *def);
-+extern void accessLogDumpLogFormat(StoreEntry * entry, const char *name, logformat * definitions);
-+extern void accessLogFreeLogFormat(logformat_token ** fmt);
- extern void hierarchyNote(HierarchyLogEntry *, hier_code, const char *);
- #if FORW_VIA_DB
- extern void fvdbCountVia(const char *key);
-Index: src/structs.h
-diff -u src/structs.h:1.48.2.46 src/structs.h:1.48.2.11.2.14
---- src/structs.h:1.48.2.46	Fri Mar 10 19:16:31 2006
-+++ src/structs.h	Mon Apr 24 08:22:34 2006
-@@ -465,7 +465,6 @@
-     char *as_whois_server;
-     struct {
- 	char *log;
--	char *access;
- 	char *store;
- 	char *swap;
- #if USE_USERAGENT_LOG
-@@ -477,6 +476,8 @@
- #if WIP_FWD_LOG
- 	char *forward;
- #endif
-+	logformat *logformats;
-+	customlog *accesslogs;
- 	int rotateNumber;
-     } Log;
-     char *adminEmail;
-@@ -623,6 +624,7 @@
- 	acl_access *AlwaysDirect;
- 	acl_access *ASlists;
- 	acl_access *noCache;
-+	acl_access *log;
- #if SQUID_SNMP
- 	acl_access *snmp;
- #endif
-@@ -1061,6 +1063,8 @@
- 	const char *method_str;
-     } private;
-     HierarchyLogEntry hier;
-+    HttpReply *reply;
-+    request_t *request;
- };
- 
- struct _clientHttpRequest {
-@@ -2210,8 +2214,32 @@
-     size_t bufsz;
-     ssize_t offset;
-     struct {
--	unsigned int fatal:1;
-+	unsigned int fatal;
-+	unsigned int syslog;
-     } flags;
-+    int syslog_priority;
-+};
-+
-+struct _logformat {
-+    char *name;
-+    logformat_token *format;
-+    logformat *next;
-+};
-+
-+struct _customlog {
-+    char *filename;
-+    acl_list *aclList;
-+    logformat *logFormat;
-+    Logfile *logfile;
-+    customlog *next;
-+    enum {
-+	CLF_UNKNOWN,
-+	CLF_AUTO,
-+	CLF_CUSTOM,
-+	CLF_SQUID,
-+	CLF_COMMON,
-+	CLF_NONE
-+    } type;
- };
- 
- struct cache_dir_option {
-Index: src/typedefs.h
-diff -u src/typedefs.h:1.25.6.8 src/typedefs.h:1.25.6.2.2.6
---- src/typedefs.h:1.25.6.8	Sat Mar 26 18:16:17 2005
-+++ src/typedefs.h	Thu May 26 21:34:16 2005
-@@ -209,6 +209,9 @@
- typedef struct _storerepl_entry storerepl_entry_t;
- typedef struct _diskd_queue diskd_queue;
- typedef struct _Logfile Logfile;
-+typedef struct _logformat_token logformat_token;
-+typedef struct _logformat logformat;
-+typedef struct _customlog customlog;
- typedef struct _RemovalPolicy RemovalPolicy;
- typedef struct _RemovalPolicyWalker RemovalPolicyWalker;
- typedef struct _RemovalPurgeWalker RemovalPurgeWalker;
diff --git a/www/squid30/files/extra-patch-src-cf.data.pre.aufs b/www/squid30/files/extra-patch-src-cf.data.pre.aufs
new file mode 100644
index 000000000000..019fdcac0fc7
--- /dev/null
+++ b/www/squid30/files/extra-patch-src-cf.data.pre.aufs
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Wed Nov  1 15:12:02 2006
++++ src/cf.data.pre	Wed Nov  1 15:12:17 2006
+@@ -1097,6 +1100,17 @@
+ 
+ 	see argument descriptions under ufs above
+ 
++	Note:
++	By default, FreeBSD uses the pthread(3) M:N threading library.
++	You can, however, map the thread library to the 1:1 libthr(3)
++	implementation by inserting the following lines into
++	/etc/libmap.conf and see whether this performs better on your
++	system:
++
++	[%%PREFIX%%/sbin/squid]
++	libpthread.so.1	libthr.so.1
++	libpthread.so.2	libthr.so.2
++
+ 	The diskd store type:
+ 
+ 	"diskd" uses the same storage format as "ufs", utilizing a
diff --git a/www/squid30/files/follow_xff-2.5.patch b/www/squid30/files/follow_xff-2.5.patch
deleted file mode 100644
index 3c08e0a7c398..000000000000
--- a/www/squid30/files/follow_xff-2.5.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-! This is a reduced part of the original follow-XFF patchset from
-! devel.squid-cache.org for use with the FreeBSD squid-2.5 port.
-Index: src/acl.c
---- src/acl.c	13 May 2003 02:14:12 -0000	1.43.2.16
-+++ src/acl.c	23 Nov 2003 14:20:12 -0000
-@@ -2001,6 +2001,11 @@
-     cbdataLock(A);
-     if (request != NULL) {
- 	checklist->request = requestLink(request);
-+#if FOLLOW_X_FORWARDED_FOR
-+	if (Config.onoff.acl_uses_indirect_client) {
-+	    checklist->src_addr = request->indirect_client_addr;
-+	} else
-+#endif /* FOLLOW_X_FORWARDED_FOR */
- 	checklist->src_addr = request->client_addr;
- 	checklist->my_addr = request->my_addr;
- 	checklist->my_port = request->my_port;
-Index: src/cf.data.pre
---- src/cf.data.pre	7 Nov 2003 03:14:30 -0000	1.49.2.46
-+++ src/cf.data.pre	23 Nov 2003 14:20:17 -0000
-@@ -2065,6 +2065,92 @@
- NOCOMMENT_END
- DOC_END
- 
-+NAME: follow_x_forwarded_for
-+TYPE: acl_access
-+IFDEF: FOLLOW_X_FORWARDED_FOR
-+LOC: Config.accessList.followXFF
-+DEFAULT: none
-+DEFAULT_IF_NONE: deny all
-+DOC_START
-+	Allowing or Denying the X-Forwarded-For header to be followed to
-+	find the original source of a request.
-+
-+	Requests may pass through a chain of several other proxies
-+	before reaching us.  The X-Forwarded-For header will contain a
-+	comma-separated list of the IP addresses in the chain, with the
-+	rightmost address being the most recent.
-+
-+	If a request reaches us from a source that is allowed by this
-+	configuration item, then we consult the X-Forwarded-For header
-+	to see where that host received the request from.  If the
-+	X-Forwarded-For header contains multiple addresses, and if
-+	acl_uses_indirect_client is on, then we continue backtracking
-+	until we reach an address for which we are not allowed to
-+	follow the X-Forwarded-For header, or until we reach the first
-+	address in the list.  (If acl_uses_indirect_client is off, then
-+	it's impossible to backtrack through more than one level of
-+	X-Forwarded-For addresses.)
-+
-+	The end result of this process is an IP address that we will
-+	refer to as the indirect client address.  This address may
-+	be treated as the client address for access control, delay
-+	pools and logging, depending on the acl_uses_indirect_client,
-+	delay_pool_uses_indirect_client and log_uses_indirect_client
-+	options.
-+
-+	SECURITY CONSIDERATIONS:
-+
-+		Any host for which we follow the X-Forwarded-For header
-+		can place incorrect information in the header, and Squid
-+		will use the incorrect information as if it were the
-+		source address of the request.  This may enable remote
-+		hosts to bypass any access control restrictions that are
-+		based on the client's source addresses.
-+
-+	For example:
-+
-+		acl localhost src 127.0.0.1
-+		acl my_other_proxy srcdomain .proxy.example.com
-+		follow_x_forwarded_for allow localhost
-+		follow_x_forwarded_for allow my_other_proxy
-+DOC_END
-+
-+NAME: acl_uses_indirect_client
-+COMMENT: on|off
-+TYPE: onoff
-+IFDEF: FOLLOW_X_FORWARDED_FOR
-+DEFAULT: on
-+LOC: Config.onoff.acl_uses_indirect_client
-+DOC_START
-+	Controls whether the indirect client address
-+	(see follow_x_forwarded_for) is used instead of the
-+	direct client address in acl matching.
-+DOC_END
-+
-+NAME: delay_pool_uses_indirect_client
-+COMMENT: on|off
-+TYPE: onoff
-+IFDEF: FOLLOW_X_FORWARDED_FOR && DELAY_POOLS
-+DEFAULT: on
-+LOC: Config.onoff.delay_pool_uses_indirect_client
-+DOC_START
-+	Controls whether the indirect client address
-+	(see follow_x_forwarded_for) is used instead of the
-+	direct client address in delay pools.
-+DOC_END
-+
-+NAME: log_uses_indirect_client
-+COMMENT: on|off
-+TYPE: onoff
-+IFDEF: FOLLOW_X_FORWARDED_FOR
-+DEFAULT: on
-+LOC: Config.onoff.log_uses_indirect_client
-+DOC_START
-+	Controls whether the indirect client address
-+	(see follow_x_forwarded_for) is used instead of the
-+	direct client address in the access log.
-+DOC_END
-+
- NAME: http_access
- TYPE: acl_access
- LOC: Config.accessList.http
-Index: src/client_side.c
---- src/client_side.c	2 Sep 2003 02:13:45 -0000	1.47.2.39
-+++ src/client_side.c	23 Nov 2003 14:20:22 -0000
-@@ -109,6 +109,11 @@
- #if USE_IDENT
- static IDCB clientIdentDone;
- #endif
-+#if FOLLOW_X_FORWARDED_FOR
-+static void clientFollowXForwardedForStart(void *data);
-+static void clientFollowXForwardedForNext(void *data);
-+static void clientFollowXForwardedForDone(int answer, void *data);
-+#endif /* FOLLOW_X_FORWARDED_FOR */
- static int clientOnlyIfCached(clientHttpRequest * http);
- static STCB clientSendMoreData;
- static STCB clientCacheHit;
-@@ -177,10 +182,179 @@
-     return ch;
- }
- 
-+#if FOLLOW_X_FORWARDED_FOR
-+/*
-+ * clientFollowXForwardedForStart() copies the X-Forwarded-For
-+ * header into x_forwarded_for_iterator and passes control to
-+ * clientFollowXForwardedForNext().
-+ *
-+ * clientFollowXForwardedForNext() checks the indirect_client_addr
-+ * against the followXFF ACL and passes the result to
-+ * clientFollowXForwardedForDone().
-+ *
-+ * clientFollowXForwardedForDone() either grabs the next address
-+ * from the tail of x_forwarded_for_iterator and loops back to
-+ * clientFollowXForwardedForNext(), or cleans up and passes control to
-+ * clientAccessCheck().
-+ */
-+
-+static void
-+clientFollowXForwardedForStart(void *data)
-+{
-+    clientHttpRequest *http = data;
-+    request_t *request = http->request;
-+    if (Config.accessList.followXFF
-+	&& httpHeaderHas(&request->header, HDR_X_FORWARDED_FOR))
-+    {
-+	request->x_forwarded_for_iterator = httpHeaderGetList(
-+			&request->header, HDR_X_FORWARDED_FOR);
-+	debug(33, 5) ("clientFollowXForwardedForStart: indirect_client_addr=%s XFF='%s'\n",
-+			inet_ntoa(request->indirect_client_addr),
-+			strBuf(request->x_forwarded_for_iterator));
-+	clientFollowXForwardedForNext(http);
-+    } else {
-+	/* not configured to follow X-Forwarded-For, or nothing to follow */
-+	debug(33, 5) ("clientFollowXForwardedForStart: nothing to do\n");
-+	clientFollowXForwardedForDone(-1, http);
-+    }
-+}
-+
-+static void
-+clientFollowXForwardedForNext(void *data)
-+{
-+    clientHttpRequest *http = data;
-+    request_t *request = http->request;
-+    debug(33, 5) ("clientFollowXForwardedForNext: indirect_client_addr=%s XFF='%s'\n",
-+		    inet_ntoa(request->indirect_client_addr),
-+		    strBuf(request->x_forwarded_for_iterator));
-+    if (strLen(request->x_forwarded_for_iterator) != 0) {
-+	/* check the acl to see whether to believe the X-Forwarded-For header */
-+	http->acl_checklist = clientAclChecklistCreate(
-+			Config.accessList.followXFF, http);
-+	aclNBCheck(http->acl_checklist, clientFollowXForwardedForDone, http);
-+    } else {
-+	/* nothing left to follow */
-+	debug(33, 5) ("clientFollowXForwardedForNext: nothing more to do\n");
-+	clientFollowXForwardedForDone(-1, http);
-+    }
-+}
-+
-+static void
-+clientFollowXForwardedForDone(int answer, void *data)
-+{
-+    clientHttpRequest *http = data;
-+    request_t *request = http->request;
-+    /*
-+     * answer should be be ACCESS_ALLOWED or ACCESS_DENIED if we are
-+     * called as a result of ACL checks, or -1 if we are called when
-+     * there's nothing left to do.
-+     */
-+    if (answer == ACCESS_ALLOWED) {
-+	/*
-+	 * The IP address currently in request->indirect_client_addr
-+	 * is trusted to use X-Forwarded-For.  Remove the last
-+	 * comma-delimited element from x_forwarded_for_iterator and use
-+	 * it to to replace indirect_client_addr, then repeat the cycle.
-+	 */
-+	const char *p;
-+	const char *asciiaddr;
-+	int l;
-+	struct in_addr addr;
-+	debug(33, 5) ("clientFollowXForwardedForDone: indirect_client_addr=%s is trusted\n",
-+			inet_ntoa(request->indirect_client_addr));
-+	p = strBuf(request->x_forwarded_for_iterator);
-+	l = strLen(request->x_forwarded_for_iterator);
-+
-+	/*
-+	 * XXX x_forwarded_for_iterator should really be a list of
-+	 * IP addresses, but it's a String instead.  We have to
-+	 * walk backwards through the String, biting off the last
-+	 * comma-delimited part each time.  As long as the data is in
-+	 * a String, we should probably implement and use a variant of
-+	 * strListGetItem() that walks backwards instead of forwards
-+	 * through a comma-separated list.  But we don't even do that;
-+	 * we just do the work in-line here.
-+	 */
-+	/* skip trailing space and commas */
-+	while (l > 0 && (p[l-1] == ',' || xisspace(p[l-1])))
-+	    l--;
-+	strCut(request->x_forwarded_for_iterator, l);
-+	/* look for start of last item in list */
-+	while (l > 0 && ! (p[l-1] == ',' || xisspace(p[l-1])))
-+	    l--;
-+	asciiaddr = p+l;
-+	if (inet_aton(asciiaddr, &addr) == 0) {
-+	    /* the address is not well formed; do not use it */
-+	    debug(33, 3) ("clientFollowXForwardedForDone: malformed address '%s'\n",
-+			    asciiaddr);
-+	    goto done;
-+	}
-+	debug(33, 3) ("clientFollowXForwardedForDone: changing indirect_client_addr from %s to '%s'\n",
-+		    inet_ntoa(request->indirect_client_addr),
-+		    asciiaddr);
-+	request->indirect_client_addr = addr;
-+	strCut(request->x_forwarded_for_iterator, l);
-+	if (! Config.onoff.acl_uses_indirect_client) {
-+	    /*
-+	     * If acl_uses_indirect_client is off, then it's impossible
-+	     * to follow more than one level of X-Forwarded-For.
-+	     */
-+	    goto done;
-+	}
-+	clientFollowXForwardedForNext(http);
-+	return;
-+    } else if (answer == ACCESS_DENIED) {
-+	debug(33, 5) ("clientFollowXForwardedForDone: indirect_client_addr=%s not trusted\n",
-+			inet_ntoa(request->indirect_client_addr));
-+    } else {
-+	debug(33, 5) ("clientFollowXForwardedForDone: indirect_client_addr=%s nothing more to do\n",
-+			inet_ntoa(request->indirect_client_addr));
-+    }
-+done:
-+    /* clean up, and pass control to clientAccessCheck */
-+    debug(33, 6) ("clientFollowXForwardedForDone: cleanup\n");
-+    if (Config.onoff.log_uses_indirect_client) {
-+	/*
-+	 * Ensure that the access log shows the indirect client
-+	 * instead of the direct client.
-+	 */
-+	ConnStateData *conn = http->conn;
-+	conn->log_addr = request->indirect_client_addr;
-+	conn->log_addr.s_addr &= Config.Addrs.client_netmask.s_addr;
-+	debug(33, 3) ("clientFollowXForwardedForDone: setting log_addr=%s\n",
-+			inet_ntoa(conn->log_addr));
-+    }
-+    stringClean(&request->x_forwarded_for_iterator);
-+    request->flags.done_follow_x_forwarded_for = 1;
-+    http->acl_checklist = NULL; /* XXX do we need to aclChecklistFree() ? */
-+    clientAccessCheck(http);
-+}
-+#endif /* FOLLOW_X_FORWARDED_FOR */
-+
- void
- clientAccessCheck(void *data)
- {
-     clientHttpRequest *http = data;
-+#if FOLLOW_X_FORWARDED_FOR
-+    if (! http->request->flags.done_follow_x_forwarded_for
-+        && httpHeaderHas(&http->request->header, HDR_X_FORWARDED_FOR))
-+    {
-+	/*
-+	 * There's an X-ForwardedFor header and we haven't yet tried
-+	 * to follow it to find the indirect_client_addr.  Follow it now.
-+	 * clientFollowXForwardedForDone() will eventually pass control
-+	 * back to us.
-+	 *
-+	 * XXX perhaps our caller should have called
-+	 *     clientFollowXForwardedForStart instead.  Then we wouldn't
-+	 *     need to do this little dance transferring control over
-+	 *     there and then back here, and we wouldn't need the
-+	 *     done_follow_x_forwarded_for flag.
-+	 */
-+	clientFollowXForwardedForStart(data);
-+	return;
-+    }
-+#endif /* FOLLOW_X_FORWARDED_FOR */
-     if (checkAccelOnly(http)) {
- 	/* deny proxy requests in accel_only mode */
- 	debug(33, 1) ("clientAccessCheck: proxy request denied in accel_only mode\n");
-@@ -325,6 +499,9 @@
- 	new_request->http_ver = old_request->http_ver;
- 	httpHeaderAppend(&new_request->header, &old_request->header);
- 	new_request->client_addr = old_request->client_addr;
-+#if FOLLOW_X_FORWARDED_FOR
-+	new_request->indirect_client_addr = old_request->indirect_client_addr;
-+#endif /* FOLLOW_X_FORWARDED_FOR */
- 	new_request->my_addr = old_request->my_addr;
- 	new_request->my_port = old_request->my_port;
- 	new_request->flags.redirected = 1;
-@@ -3051,6 +3228,9 @@
- 	    safe_free(http->log_uri);
- 	    http->log_uri = xstrdup(urlCanonicalClean(request));
- 	    request->client_addr = conn->peer.sin_addr;
-+#if FOLLOW_X_FORWARDED_FOR
-+	    request->indirect_client_addr = request->client_addr;
-+#endif /* FOLLOW_X_FORWARDED_FOR */
- 	    request->my_addr = conn->me.sin_addr;
- 	    request->my_port = ntohs(conn->me.sin_port);
- 	    request->http_ver = http->http_ver;
-Index: src/delay_pools.c
---- src/delay_pools.c	19 Jun 2003 02:13:57 -0000	1.5.54.6
-+++ src/delay_pools.c	23 Nov 2003 14:20:23 -0000
-@@ -318,6 +318,11 @@
-     r = http->request;
- 
-     memset(&ch, '\0', sizeof(ch));
-+#if FOLLOW_X_FORWARDED_FOR
-+    if (Config.onoff.delay_pool_uses_indirect_client) {
-+	ch.src_addr = r->indirect_client_addr;
-+    } else
-+#endif /* FOLLOW_X_FORWARDED_FOR */
-     ch.src_addr = r->client_addr;
-     ch.my_addr = r->my_addr;
-     ch.my_port = r->my_port;
-*** src/structs.h.orig	Sun Jun 26 12:45:58 2005
---- src/structs.h	Sun Jun 26 12:48:45 2005
-***************
-*** 610,615 ****
---- 610,620 ----
-  	int accel_uses_host_header;
-  	int accel_no_pmtu_disc;
-  	int global_internal_static;
-+ #if FOLLOW_X_FORWARDED_FOR
-+ 	int acl_uses_indirect_client;
-+ 	int delay_pool_uses_indirect_client;
-+ 	int log_uses_indirect_client;
-+ #endif /* FOLLOW_X_FORWARDED_FOR */
-      } onoff;
-      acl *aclList;
-      struct {
-***************
-*** 631,636 ****
---- 636,644 ----
-  	acl_access *reply;
-  	acl_address *outgoing_address;
-  	acl_tos *outgoing_tos;
-+ #if FOLLOW_X_FORWARDED_FOR
-+ 	acl_access *followXFF;
-+ #endif /* FOLLOW_X_FORWARDED_FOR */
-      } accessList;
-      acl_deny_info_list *denyInfoList;
-      struct _authConfig {
-***************
-*** 1623,1628 ****
---- 1631,1641 ----
-      unsigned int body_sent:1;
-      unsigned int reset_tcp:1;
-      unsigned int must_keepalive:1;
-+ #if FOLLOW_X_FORWARDED_FOR
-+     /* XXX this flag could be eliminated;
-+      * see comments in clientAccessCheck */
-+     unsigned int done_follow_x_forwarded_for;
-+ #endif /* FOLLOW_X_FORWARDED_FOR */
-  };
-  
-  struct _link_list {
-***************
-*** 1666,1671 ****
---- 1679,1687 ----
-      int max_forwards;
-      /* these in_addr's could probably be sockaddr_in's */
-      struct in_addr client_addr;
-+ #if FOLLOW_X_FORWARDED_FOR
-+     struct in_addr indirect_client_addr; /* after following X-Forwarded-For */
-+ #endif /* FOLLOW_X_FORWARDED_FOR */
-      struct in_addr my_addr;
-      unsigned short my_port;
-      HttpHeader header;
-***************
-*** 1677,1682 ****
---- 1693,1703 ----
-      const char *vary_headers;	/* Used when varying entities are detected. Changes how the store key is calculated */
-      BODY_HANDLER *body_reader;
-      void *body_reader_data;
-+ #if FOLLOW_X_FORWARDED_FOR
-+     /* XXX a list of IP addresses would be a better data structure
-+      * than this String */
-+     String x_forwarded_for_iterator;
-+ #endif /* FOLLOW_X_FORWARDED_FOR */
-  };
-  
-  struct _cachemgr_passwd {
diff --git a/www/squid30/files/follow_xff-configure.patch b/www/squid30/files/follow_xff-configure.patch
deleted file mode 100644
index 7892ad95278b..000000000000
--- a/www/squid30/files/follow_xff-configure.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-!Simulate the autotools bootstrap of the follow-x-forwarded-for patchset.
-!
-!Beware that all line number informations in configure.log greater
-!than 2972 are offset by at least -29 (correcting all line numbers would have
-!bloated the patch by 92kB!)
---- include/autoconf.h.in.orig	Sat Jan 18 02:46:11 2003
-+++ include/autoconf.h.in	Thu Jun 24 13:19:07 2004
-@@ -291,6 +291,12 @@
- #define USE_IDENT 1
- 
- /*
-+ * Compile in support for following X-Forwarded-For headers?
-+ * Enabled by default.
-+ */
-+#define FOLLOW_X_FORWARDED_FOR 1
-+
-+/*
-  * If your system has statvfs(), and if it actually works!
-  */
- #undef HAVE_STATVFS
---- configure.orig	Thu Sep 22 10:16:26 2005
-+++ configure	Thu Sep 22 17:29:01 2005
-@@ -249,6 +249,12 @@
-                           if you build as another user who is not privileged
-                           to use the number of filedescriptors you want the
-                           resulting binary to support"
-+ac_help="$ac_help
-+  --enable-follow-x-forwarded-for
-+                          Enable support for following the X-Forwarded-For
-+                          HTTP header to try to find the IP address of the
-+                          original or indirect client when a request has
-+                          been forwarded through other proxies."
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -3255,6 +3261,29 @@
- 
- fi
- 
-+
-+follow_xff=1
-+# Check whether --enable-follow-x-forwarded-for or --disable-follow-x-forwarded-for was given.
-+if test "${enable_follow_x_forwarded_for+set}" = set; then
-+  enableval="$enable_follow_x_forwarded_for"
-+   if test "$enableval" = "yes" ; then
-+    echo "follow X-Forwarded-For enabled"
-+    follow_xff=1
-+  fi
-+
-+fi
-+
-+if test $follow_xff = 1; then
-+    cat >> confdefs.h <<\EOF
-+#define FOLLOW_X_FORWARDED_FOR 1
-+EOF
-+
-+else
-+    cat >> confdefs.h <<\EOF
-+#define FOLLOW_X_FORWARDED_FOR 0
-+EOF
-+
-+fi
- 
- # Force some compilers to use ANSI features
- #
diff --git a/www/squid30/files/icap-2.5-bootstrap.patch b/www/squid30/files/icap-2.5-bootstrap.patch
deleted file mode 100644
index 247ca0c94cbc..000000000000
--- a/www/squid30/files/icap-2.5-bootstrap.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-Patch 2 of 2 to integrate the icap-2_5 branch into the FreeBSD squid port.
-
-Created by Thomas-Martin Seck <tmseck@netcologne.de>.
-
-This patch simulates the autotools bootstrap necessary after applying the
-ICAP patchset.
-
-Please see icap-2.5-core.patch for further information.
-
-Patch last updated: 2005-12-17
-
---- configure.orig	Sat Oct 22 11:56:01 2005
-+++ configure	Sat Dec 17 17:45:21 2005
-@@ -70,6 +70,8 @@
- ac_help="$ac_help
-   --enable-delay-pools    Enable delay pools to limit bandwidth usage"
- ac_help="$ac_help
-+  --enable-icap-support   	   Enable iCAP client capability"
-+ac_help="$ac_help
-   --enable-useragent-log  Enable logging of User-Agent header"
- ac_help="$ac_help
-   --enable-referer-log    Enable logging of Referer header"
-@@ -2170,6 +2172,38 @@
- 
- 
- 
-+
-+if false; then
-+  USE_ICAP_TRUE=
-+  USE_ICAP_FALSE='#'
-+else
-+  USE_ICAP_TRUE='#'
-+  USE_ICAP_FALSE=
-+fi
-+# Check whether --enable-icap-support or --disable-icap-support was given.
-+if test "${enable_icap_support+set}" = set; then
-+  enableval="$enable_icap_support"
-+   if test "$enableval" = "yes" ; then
-+    echo "ICAP support enabled"
-+    cat >> confdefs.h <<\EOF
-+#define HS_FEAT_ICAP 1
-+EOF
-+
-+    
-+
-+if true; then
-+  USE_ICAP_TRUE=
-+  USE_ICAP_FALSE='#'
-+else
-+  USE_ICAP_TRUE='#'
-+  USE_ICAP_FALSE=
-+fi
-+  fi
-+
-+fi
-+
-+
-+
- # Check whether --enable-useragent-log or --disable-useragent-log was given.
- if test "${enable_useragent_log+set}" = set; then
-   enableval="$enable_useragent_log"
-@@ -7428,14 +7462,14 @@
-         fi
-     ;;
-     esac
--    echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
--echo "configure:7433: checking for main in -lpthread" >&5
-+    echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6
-+echo "configure:7433: checking for main in -pthread" >&5
- ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 7441 "configure"
- #include "confdefs.h"
-@@ -7465,7 +7499,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -7769,6 +7803,8 @@
- 	srand48 \
- 	srandom \
- 	statfs \
-+	strnstr \
-+	strcasestr \
- 	strtoll \
- 	sysconf \
- 	syslog \
-@@ -7898,6 +7934,50 @@
- fi
- fi
- 
-+
-+if false; then
-+  NEED_OWN_STRNSTR_TRUE=
-+  NEED_OWN_STRNSTR_FALSE='#'
-+else
-+  NEED_OWN_STRNSTR_TRUE='#'
-+  NEED_OWN_STRNSTR_FALSE=
-+fi
-+if test "$ac_cv_func_strnstr" = "no" || test "$ac_cv_func_vstrnstr" = "no" ; then
-+  
-+
-+if true; then
-+  NEED_OWN_STRNSTR_TRUE=
-+  NEED_OWN_STRNSTR_FALSE='#'
-+else
-+  NEED_OWN_STRNSTR_TRUE='#'
-+  NEED_OWN_STRNSTR_FALSE=
-+fi
-+fi
-+
-+
-+
-+if false; then
-+  NEED_OWN_STRCASESTR_TRUE=
-+  NEED_OWN_STRCASESTR_FALSE='#'
-+else
-+  NEED_OWN_STRCASESTR_TRUE='#'
-+  NEED_OWN_STRCASESTR_FALSE=
-+fi
-+if test "$ac_cv_func_strcasestr" = "no" || test "$ac_cv_func_vstrcasestr" = "no"; then
-+  
-+
-+if true; then
-+  NEED_OWN_STRCASESTR_TRUE=
-+  NEED_OWN_STRCASESTR_FALSE='#'
-+else
-+  NEED_OWN_STRCASESTR_TRUE='#'
-+  NEED_OWN_STRCASESTR_FALSE=
-+fi
-+fi
-+
-+
-+
-+
- echo $ac_n "checking if va_copy is implemented""... $ac_c" 1>&6
- echo "configure:7903: checking if va_copy is implemented" >&5
- if eval "test \"`echo '$''{'ac_cv_func_va_copy'+set}'`\" = set"; then
-@@ -9072,6 +9152,8 @@
- s%@ENABLE_PINGER_FALSE@%$ENABLE_PINGER_FALSE%g
- s%@USE_DELAY_POOLS_TRUE@%$USE_DELAY_POOLS_TRUE%g
- s%@USE_DELAY_POOLS_FALSE@%$USE_DELAY_POOLS_FALSE%g
-+s%@USE_ICAP_TRUE@%$USE_ICAP_TRUE%g
-+s%@USE_ICAP_FALSE@%$USE_ICAP_FALSE%g
- s%@USE_SNMP_TRUE@%$USE_SNMP_TRUE%g
- s%@USE_SNMP_FALSE@%$USE_SNMP_FALSE%g
- s%@SNMPLIB@%$SNMPLIB%g
-@@ -9118,6 +9200,10 @@
- s%@LIB_LBER@%$LIB_LBER%g
- s%@NEED_OWN_SNPRINTF_TRUE@%$NEED_OWN_SNPRINTF_TRUE%g
- s%@NEED_OWN_SNPRINTF_FALSE@%$NEED_OWN_SNPRINTF_FALSE%g
-+s%@NEED_OWN_STRNSTR_TRUE@%$NEED_OWN_STRNSTR_TRUE%g
-+s%@NEED_OWN_STRNSTR_FALSE@%$NEED_OWN_STRNSTR_FALSE%g
-+s%@NEED_OWN_STRCASESTR_TRUE@%$NEED_OWN_STRCASESTR_TRUE%g
-+s%@NEED_OWN_STRCASESTR_FALSE@%$NEED_OWN_STRCASESTR_FALSE%g
- s%@REGEXLIB@%$REGEXLIB%g
- s%@LIBREGEX@%$LIBREGEX%g
- s%@LIBOBJS@%$LIBOBJS%g
---- include/autoconf.h.in.orig	Tue Sep 13 02:12:34 2005
-+++ include/autoconf.h.in	Sat Dec 17 17:45:21 2005
-@@ -124,6 +124,11 @@
-  */
- #undef DELAY_POOLS
- 
-+/* 
-+ * ICAP - Internet Content Adaptation Protocol
-+ */
-+#undef HS_FEAT_ICAP
-+
- /*
-  * If you want to log User-Agent request header values, define this.
-  * By default, they are written to useragent.log in the Squid log
-@@ -574,6 +579,12 @@
- 
- /* Define if you have the statfs function.  */
- #undef HAVE_STATFS
-+
-+/* Define if you have the strcasestr function. */
-+#undef HAVE_STRCASESTR
-+
-+/* Define if you have the strnstr function. */
-+#undef HAVE_STRNSTR
- 
- /* Define if you have the strerror function.  */
- #undef HAVE_STRERROR
---- lib/Makefile.in.orig	Wed Sep 28 22:57:20 2005
-+++ lib/Makefile.in	Sat Dec 17 17:45:21 2005
-@@ -123,6 +123,13 @@
- 
- @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c
- @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE = 
-+
-+@NEED_OWN_STRNSTR_TRUE@STRNSTRSOURCE = strnstr.c
-+@NEED_OWN_STRNSTR_FALSE@STRNSTRSOURCE = 
-+
-+@NEED_OWN_STRCASESTR_TRUE@STRCASESTRSOURCE = strcasestr.c
-+@NEED_OWN_STRCASESTR_FALSE@STRCASESTRSOURCE = 
-+
- @NEED_OWN_MD5_TRUE@MD5SOURCE = md5.c
- @NEED_OWN_MD5_FALSE@MD5SOURCE = 
- 
-@@ -158,6 +165,8 @@
- 	$(SNPRINTFSOURCE) \
- 	splay.c \
- 	Stack.c \
-+	$(STRNSTRSOURCE) \
-+	$(STRCASESTRSOURCE) \
- 	stub_memaccount.c \
- 	util.c \
- 	uudecode.c
-@@ -196,13 +205,18 @@
- @NEED_OWN_MD5_FALSE@am__objects_1 =
- @NEED_OWN_SNPRINTF_FALSE@am__objects_2 =
- @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT)
-+@NEED_OWN_STRNSTR_FALSE@am__objects_3 =
-+@NEED_OWN_STRNSTR_TRUE@am__objects_3 = strnstr.$(OBJEXT)
-+@NEED_OWN_STRCASESTR_TRUE@am__objects_4 = strcasestr.$(OBJEXT)
-+@NEED_OWN_STRCASESTR_FALSE@am__objects_4 =
- am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
- 	getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
- 	html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \
- 	radix.$(OBJEXT) rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) \
- 	rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \
- 	$(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \
--	stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT)
-+	$(am__objects_3) $(am__objects_4) stub_memaccount.$(OBJEXT) \
-+	util.$(OBJEXT) uudecode.$(OBJEXT)
- libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
- libntlmauth_a_AR = $(AR) cru
- libntlmauth_a_DEPENDENCIES = @LIBOBJS@
-@@ -224,15 +238,16 @@
- @AMDEP_TRUE@	$(DEPDIR)/dlmalloc.Po $(DEPDIR)/drand48.Po \
- @AMDEP_TRUE@	$(DEPDIR)/getfullhostname.Po $(DEPDIR)/hash.Po \
- @AMDEP_TRUE@	$(DEPDIR)/heap.Po $(DEPDIR)/html_quote.Po \
--@AMDEP_TRUE@	$(DEPDIR)/inet_ntoa.Po $(DEPDIR)/initgroups.Po \
--@AMDEP_TRUE@	$(DEPDIR)/iso3307.Po $(DEPDIR)/md5.Po \
--@AMDEP_TRUE@	$(DEPDIR)/ntlmauth.Po $(DEPDIR)/radix.Po \
--@AMDEP_TRUE@	$(DEPDIR)/rfc1035.Po $(DEPDIR)/rfc1123.Po \
--@AMDEP_TRUE@	$(DEPDIR)/rfc1738.Po $(DEPDIR)/rfc2617.Po \
--@AMDEP_TRUE@	$(DEPDIR)/safe_inet_addr.Po $(DEPDIR)/snprintf.Po \
--@AMDEP_TRUE@	$(DEPDIR)/splay.Po $(DEPDIR)/strerror.Po \
--@AMDEP_TRUE@	$(DEPDIR)/stub_memaccount.Po $(DEPDIR)/tempnam.Po \
--@AMDEP_TRUE@	$(DEPDIR)/util.Po $(DEPDIR)/uudecode.Po
-+@AMDEP_TRUE@	$(DEPDIR)/inet_ntoa.Po $(DEPDIR)/iso3307.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/md5.Po $(DEPDIR)/ntlmauth.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/radix.Po $(DEPDIR)/rfc1035.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/rfc1123.Po $(DEPDIR)/rfc1738.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/rfc2617.Po $(DEPDIR)/safe_inet_addr.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/snprintf.Po $(DEPDIR)/splay.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/strcasestr.Po $(DEPDIR)/strerror.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/strnstr.Po $(DEPDIR)/stub_memaccount.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/tempnam.Po $(DEPDIR)/util.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/uudecode.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -241,8 +256,8 @@
- DIST_SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \
- 	$(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
- 	$(libregex_a_SOURCES)
--DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c \
--	initgroups.c strerror.c tempnam.c
-+DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c strerror.c \
-+	tempnam.c
- SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES)
- 
- all: all-am
-@@ -295,7 +310,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/heap.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/html_quote.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntoa.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iso3307.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntlmauth.Po@am__quote@
-@@ -307,7 +321,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/safe_inet_addr.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/splay.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasestr.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnstr.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stub_memaccount.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@
---- src/Makefile.in.orig	Wed Sep 28 22:57:21 2005
-+++ src/Makefile.in	Sat Dec 17 17:45:21 2005
-@@ -125,6 +125,9 @@
- install_sh = @install_sh@
- makesnmplib = @makesnmplib@
- 
-+@USE_ICAP_TRUE@ICAPSOURCE = icap_common.c icap_reqmod.c icap_respmod.c icap_opt.c
-+@USE_ICAP_FALSE@ICAPSOURCE = 
-+
- @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
- @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
- @USE_DNSSERVER_TRUE@DNSSERVER = dnsserver
-@@ -249,6 +252,7 @@
- 	HttpMsg.c \
- 	HttpReply.c \
- 	HttpRequest.c \
-+	$(ICAPSOURCE) \
- 	icmp.c \
- 	icp_v2.c \
- 	icp_v3.c \
-@@ -468,54 +472,58 @@
- pinger_LDADD = $(LDADD)
- pinger_DEPENDENCIES =
- pinger_LDFLAGS =
--@USE_DELAY_POOLS_TRUE@am__objects_3 = delay_pools.$(OBJEXT)
--@USE_DELAY_POOLS_FALSE@am__objects_3 =
--@USE_DNSSERVER_FALSE@am__objects_4 = dns_internal.$(OBJEXT)
--@USE_DNSSERVER_TRUE@am__objects_4 = dns.$(OBJEXT)
--@ENABLE_HTCP_TRUE@am__objects_5 = htcp.$(OBJEXT)
--@MAKE_LEAKFINDER_FALSE@am__objects_6 =
--@MAKE_LEAKFINDER_TRUE@am__objects_6 = leakfinder.$(OBJEXT)
--@USE_SNMP_TRUE@am__objects_7 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT)
--@USE_SNMP_FALSE@am__objects_7 =
--@ENABLE_SSL_TRUE@am__objects_8 = ssl_support.$(OBJEXT)
--@ENABLE_SSL_FALSE@am__objects_8 =
--@ENABLE_UNLINKD_FALSE@am__objects_9 =
--@ENABLE_UNLINKD_TRUE@am__objects_9 = unlinkd.$(OBJEXT)
--@ENABLE_WIN32SPECIFIC_TRUE@am__objects_10 = win32.$(OBJEXT)
--@ENABLE_WIN32SPECIFIC_FALSE@am__objects_10 =
-+@USE_DELAY_POOLS_FALSE@am__objects_5 =
-+@USE_DELAY_POOLS_TRUE@am__objects_5 = delay_pools.$(OBJEXT)
-+@USE_DNSSERVER_FALSE@am__objects_6 = dns_internal.$(OBJEXT)
-+@USE_DNSSERVER_TRUE@am__objects_6 = dns.$(OBJEXT)
-+@ENABLE_HTCP_TRUE@am__objects_7 = htcp.$(OBJEXT)
-+@USE_ICAP_TRUE@am__objects_8 = icap_common.$(OBJEXT) \
-+@USE_ICAP_TRUE@	icap_reqmod.$(OBJEXT) icap_respmod.$(OBJEXT) \
-+@USE_ICAP_TRUE@	icap_opt.$(OBJEXT)
-+@USE_ICAP_FALSE@am__objects_8 =
-+@MAKE_LEAKFINDER_TRUE@am__objects_9 = leakfinder.$(OBJEXT)
-+@MAKE_LEAKFINDER_FALSE@am__objects_9 =
-+@USE_SNMP_TRUE@am__objects_10 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT)
-+@USE_SNMP_FALSE@am__objects_10 =
-+@ENABLE_SSL_FALSE@am__objects_11 =
-+@ENABLE_SSL_TRUE@am__objects_11 = ssl_support.$(OBJEXT)
-+@ENABLE_UNLINKD_TRUE@am__objects_12 = unlinkd.$(OBJEXT)
-+@ENABLE_UNLINKD_FALSE@am__objects_12 =
-+@ENABLE_WIN32SPECIFIC_FALSE@am__objects_13 =
-+@ENABLE_WIN32SPECIFIC_TRUE@am__objects_13 = win32.$(OBJEXT)
- am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
- 	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \
- 	cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
- 	client_db.$(OBJEXT) client_side.$(OBJEXT) comm.$(OBJEXT) \
--	comm_select.$(OBJEXT) debug.$(OBJEXT) $(am__objects_3) \
--	disk.$(OBJEXT) $(am__objects_4) errorpage.$(OBJEXT) \
-+	comm_select.$(OBJEXT) debug.$(OBJEXT) $(am__objects_5) \
-+	disk.$(OBJEXT) $(am__objects_6) errorpage.$(OBJEXT) \
- 	ETag.$(OBJEXT) event.$(OBJEXT) external_acl.$(OBJEXT) \
- 	fd.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \
- 	fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \
--	helper.$(OBJEXT) $(am__objects_5) http.$(OBJEXT) \
-+	helper.$(OBJEXT) $(am__objects_7) http.$(OBJEXT) \
- 	HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \
- 	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
- 	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
- 	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
--	HttpRequest.$(OBJEXT) icmp.$(OBJEXT) icp_v2.$(OBJEXT) \
--	icp_v3.$(OBJEXT) ident.$(OBJEXT) internal.$(OBJEXT) \
--	ipc.$(OBJEXT) ipcache.$(OBJEXT) $(am__objects_6) \
--	logfile.$(OBJEXT) main.$(OBJEXT) mem.$(OBJEXT) \
-+	HttpRequest.$(OBJEXT) $(am__objects_8) icmp.$(OBJEXT) \
-+	icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) ident.$(OBJEXT) \
-+	internal.$(OBJEXT) ipc.$(OBJEXT) ipcache.$(OBJEXT) \
-+	$(am__objects_9) logfile.$(OBJEXT) main.$(OBJEXT) mem.$(OBJEXT) \
- 	MemPool.$(OBJEXT) MemBuf.$(OBJEXT) mime.$(OBJEXT) \
- 	multicast.$(OBJEXT) neighbors.$(OBJEXT) net_db.$(OBJEXT) \
- 	Packer.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \
- 	peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
--	refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_7) \
--	ssl.$(OBJEXT) $(am__objects_8) stat.$(OBJEXT) \
-+	refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_10) \
-+	ssl.$(OBJEXT) $(am__objects_11) stat.$(OBJEXT) \
- 	StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \
- 	store.$(OBJEXT) store_io.$(OBJEXT) store_client.$(OBJEXT) \
- 	store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
- 	store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
- 	store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
- 	store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
--	tools.$(OBJEXT) $(am__objects_9) url.$(OBJEXT) urn.$(OBJEXT) \
-+	tools.$(OBJEXT) $(am__objects_12) url.$(OBJEXT) urn.$(OBJEXT) \
- 	useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
--	whois.$(OBJEXT) $(am__objects_10)
-+	whois.$(OBJEXT) $(am__objects_13)
- nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \
- 	store_modules.$(OBJEXT) globals.$(OBJEXT) \
- 	string_arrays.$(OBJEXT)
-@@ -563,7 +571,9 @@
- @AMDEP_TRUE@	$(DEPDIR)/fqdncache.Po $(DEPDIR)/ftp.Po \
- @AMDEP_TRUE@	$(DEPDIR)/globals.Po $(DEPDIR)/gopher.Po \
- @AMDEP_TRUE@	$(DEPDIR)/helper.Po $(DEPDIR)/htcp.Po \
--@AMDEP_TRUE@	$(DEPDIR)/http.Po $(DEPDIR)/icmp.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/http.Po $(DEPDIR)/icap_common.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/icap_opt.Po $(DEPDIR)/icap_reqmod.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/icap_respmod.Po $(DEPDIR)/icmp.Po \
- @AMDEP_TRUE@	$(DEPDIR)/icp_v2.Po $(DEPDIR)/icp_v3.Po \
- @AMDEP_TRUE@	$(DEPDIR)/ident.Po $(DEPDIR)/internal.Po \
- @AMDEP_TRUE@	$(DEPDIR)/ipc.Po $(DEPDIR)/ipcache.Po \
-@@ -777,6 +787,10 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/helper.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/htcp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_common.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_opt.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_reqmod.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_respmod.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icmp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icp_v2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icp_v3.Po@am__quote@
diff --git a/www/squid30/files/icap-2.6-bootstrap.patch b/www/squid30/files/icap-2.6-bootstrap.patch
new file mode 100644
index 000000000000..e14fe0a1a1d8
--- /dev/null
+++ b/www/squid30/files/icap-2.6-bootstrap.patch
@@ -0,0 +1,470 @@
+Patch 2 of 2 to integrate the icap-2_6 branch into the FreeBSD squid port.
+
+Created by Thomas-Martin Seck <tmseck@netcologne.de>.
+
+This patch simulates the autotools bootstrap necessary after applying the
+ICAP patchset.
+
+Please see icap-2.6-core.patch for further information.
+
+Patch last updated: 2006-11-04
+
+--- configure.orig Sat Nov  4 16:28:41 2006
++++ configure	Sat Nov  4 16:31:58 2006
+@@ -312,7 +312,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRNSTR_TRUE NEED_OWN_STRNSTR_FALSE NEED_OWN_STRCASESTR_TRUE NEED_OWN_STRCASESTR_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -890,6 +890,7 @@
+ 			  to build your custom policy
+   --enable-icmp           Enable ICMP pinging
+   --enable-delay-pools    Enable delay pools to limit bandwidth usage
++  --enable-icap-support   	   Enable ICAP client capability
+   --enable-useragent-log  Enable logging of User-Agent header
+   --enable-referer-log    Enable logging of Referer header
+   --disable-wccp          Disable Web Cache Coordination V1 Protocol
+@@ -3954,6 +3955,40 @@
+ fi;
+ 
+ 
++
++if false; then
++  USE_ICAP_TRUE=
++  USE_ICAP_FALSE='#'
++else
++  USE_ICAP_TRUE='#'
++  USE_ICAP_FALSE=
++fi
++
++# Check whether --enable-icap-support or --disable-icap-support was given.
++if test "${enable_icap_support+set}" = set; then
++  enableval="$enable_icap_support"
++   if test "$enableval" = "yes" ; then
++    echo "ICAP support enabled"
++
++cat >>confdefs.h <<\_ACEOF
++#define HS_FEAT_ICAP 1
++_ACEOF
++
++
++
++if true; then
++  USE_ICAP_TRUE=
++  USE_ICAP_FALSE='#'
++else
++  USE_ICAP_TRUE='#'
++  USE_ICAP_FALSE=
++fi
++
++  fi
++
++fi;
++
++
+ # Check whether --enable-useragent-log or --disable-useragent-log was given.
+ if test "${enable_useragent_log+set}" = set; then
+   enableval="$enable_useragent_log"
+@@ -15923,6 +15958,8 @@
+ 
+ 
+ 
++
++
+ for ac_func in \
+ 	bcopy \
+ 	backtrace_symbols_fd \
+@@ -15971,6 +16008,8 @@
+ 	srand48 \
+ 	srandom \
+ 	statfs \
++	strnstr \
++	strcasestr \
+ 	strsep \
+ 	strtoll \
+ 	sysconf \
+@@ -16430,6 +16469,52 @@
+ 
+ 
+ if false; then
++  NEED_OWN_STRNSTR_TRUE=
++  NEED_OWN_STRNSTR_FALSE='#'
++else
++  NEED_OWN_STRNSTR_TRUE='#'
++  NEED_OWN_STRNSTR_FALSE=
++fi
++
++if test "$ac_cv_func_strnstr" = "no" || test "$ac_cv_func_vstrnstr" = "no" ; then
++
++
++if true; then
++  NEED_OWN_STRNSTR_TRUE=
++  NEED_OWN_STRNSTR_FALSE='#'
++else
++  NEED_OWN_STRNSTR_TRUE='#'
++  NEED_OWN_STRNSTR_FALSE=
++fi
++
++fi
++
++
++
++if false; then
++  NEED_OWN_STRCASESTR_TRUE=
++  NEED_OWN_STRCASESTR_FALSE='#'
++else
++  NEED_OWN_STRCASESTR_TRUE='#'
++  NEED_OWN_STRCASESTR_FALSE=
++fi
++
++if test "$ac_cv_func_strcasestr" = "no" || test "$ac_cv_func_vstrcasestr" = "no"; then
++
++
++if true; then
++  NEED_OWN_STRCASESTR_TRUE=
++  NEED_OWN_STRCASESTR_FALSE='#'
++else
++  NEED_OWN_STRCASESTR_TRUE='#'
++  NEED_OWN_STRCASESTR_FALSE=
++fi
++
++fi
++
++
++
++if false; then
+   NEED_OWN_STRSEP_TRUE=
+   NEED_OWN_STRSEP_FALSE='#'
+ else
+@@ -17947,6 +18032,20 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${USE_ICAP_TRUE}" && test -z "${USE_ICAP_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"USE_ICAP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${USE_ICAP_TRUE}" && test -z "${USE_ICAP_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"USE_ICAP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -18101,6 +18200,34 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -18766,6 +18893,8 @@
+ s,@ENABLE_PINGER_FALSE@,$ENABLE_PINGER_FALSE,;t t
+ s,@USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t
+ s,@USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t
++s,@USE_ICAP_TRUE@,$USE_ICAP_TRUE,;t t
++s,@USE_ICAP_FALSE@,$USE_ICAP_FALSE,;t t
+ s,@USE_SNMP_TRUE@,$USE_SNMP_TRUE,;t t
+ s,@USE_SNMP_FALSE@,$USE_SNMP_FALSE,;t t
+ s,@SNMPLIB@,$SNMPLIB,;t t
+@@ -18599,6 +18728,10 @@
+ s,@USE_KQUEUE_FALSE@,$USE_KQUEUE_FALSE,;t t
+ s,@NEED_OWN_SNPRINTF_TRUE@,$NEED_OWN_SNPRINTF_TRUE,;t t
+ s,@NEED_OWN_SNPRINTF_FALSE@,$NEED_OWN_SNPRINTF_FALSE,;t t
++s,@NEED_OWN_STRNSTR_TRUE@,$NEED_OWN_STRNSTR_TRUE,;t t
++s,@NEED_OWN_STRNSTR_FALSE@,$NEED_OWN_STRNSTR_FALSE,;t t
++s,@NEED_OWN_STRCASESTR_TRUE@,$NEED_OWN_STRCASESTR_TRUE,;t t
++s,@NEED_OWN_STRCASESTR_FALSE@,$NEED_OWN_STRCASESTR_FALSE,;t t
+ s,@NEED_OWN_STRSEP_TRUE@,$NEED_OWN_STRSEP_TRUE,;t t
+ s,@NEED_OWN_STRSEP_FALSE@,$NEED_OWN_STRSEP_FALSE,;t t
+ s,@REGEXLIB@,$REGEXLIB,;t t
+--- include/autoconf.h.in.orig Wed Jul 12 17:00:31 2006
++++ include/autoconf.h.in	Sat Aug  5 16:18:25 2006
+@@ -454,6 +454,9 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+ 
++/* Define to 1 if you have the `strcasestr' function. */
++#undef HAVE_STRCASESTR
++
+ /* Define to 1 if you have the `strerror' function. */
+ #undef HAVE_STRERROR
+ 
+@@ -463,6 +466,9 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+ 
++/* Define to 1 if you have the `strnstr' function. */
++#undef HAVE_STRNSTR
++
+ /* Define to 1 if you have the `strsep' function. */
+ #undef HAVE_STRSEP
+ 
+@@ -587,6 +593,9 @@
+ 
+ /* Some systems support __va_copy */
+ #undef HAVE___VA_COPY
++
++/* Content filtering via ICAP servers. */
++#undef HS_FEAT_ICAP
+ 
+ /* By default (for now anyway) Squid includes options which allows the cache
+    administrator to violate the HTTP protocol specification in terms of cache
+--- lib/Makefile.in.orig Fri Sep 22 11:09:48 2006
++++ lib/Makefile.in	Sat Sep 19 20:05:28 2006
+@@ -62,20 +62,23 @@
+ am__libmiscutil_a_SOURCES_DIST = Array.c base64.c getfullhostname.c \
+ 	hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \
+ 	rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \
+-	splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \
+-	win32lib.c
++	splay.c Stack.c strnstr.c strcasestr.c strsep.c \
++	stub_memaccount.c util.c uudecode.c win32lib.c
+ @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT)
+ @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT)
+-@NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT)
+-@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT)
++@NEED_OWN_STRNSTR_TRUE@am__objects_3 = strnstr.$(OBJEXT)
++@NEED_OWN_STRCASESTR_TRUE@am__objects_4 = strcasestr.$(OBJEXT)
++@NEED_OWN_STRSEP_TRUE@am__objects_5 = strsep.$(OBJEXT)
++@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_6 = win32lib.$(OBJEXT)
+ am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
+ 	getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
+ 	html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \
+ 	radix.$(OBJEXT) rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) \
+ 	rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \
+ 	$(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \
+-	$(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
+-	uudecode.$(OBJEXT) $(am__objects_4)
++	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
++	stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) \
++	$(am__objects_6)
+ libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
+ libntlmauth_a_AR = $(AR) $(ARFLAGS)
+ libntlmauth_a_DEPENDENCIES = @LIBOBJS@
+@@ -190,6 +193,10 @@
+ NEED_OWN_MD5_TRUE = @NEED_OWN_MD5_TRUE@
+ NEED_OWN_SNPRINTF_FALSE = @NEED_OWN_SNPRINTF_FALSE@
+ NEED_OWN_SNPRINTF_TRUE = @NEED_OWN_SNPRINTF_TRUE@
++NEED_OWN_STRCASESTR_FALSE = @NEED_OWN_STRCASESTR_FALSE@
++NEED_OWN_STRCASESTR_TRUE = @NEED_OWN_STRCASESTR_TRUE@
++NEED_OWN_STRNSTR_FALSE = @NEED_OWN_STRNSTR_FALSE@
++NEED_OWN_STRNSTR_TRUE = @NEED_OWN_STRNSTR_TRUE@
+ NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
+ NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
+ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
+@@ -229,6 +236,8 @@
+ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
+ USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
+ USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
++USE_ICAP_FALSE = @USE_ICAP_FALSE@
++USE_ICAP_TRUE = @USE_ICAP_TRUE@
+ USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
+ USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
+ USE_POLL_FALSE = @USE_POLL_FALSE@
+@@ -284,6 +293,10 @@
+ target_alias = @target_alias@
+ @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE = 
+ @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c
++@NEED_OWN_STRNSTR_FALSE@STRNSTRSOURCE = 
++@NEED_OWN_STRNSTR_TRUE@STRNSTRSOURCE = strnstr.c
++@NEED_OWN_STRCASESTR_FALSE@STRCASESTRSOURCE = 
++@NEED_OWN_STRCASESTR_TRUE@STRCASESTRSOURCE = strcasestr.c
+ @NEED_OWN_STRSEP_FALSE@STRSEPSOURCE = 
+ @NEED_OWN_STRSEP_TRUE@STRSEPSOURCE = strsep.c
+ @NEED_OWN_MD5_FALSE@MD5SOURCE = 
+@@ -328,6 +341,8 @@
+ 	$(SNPRINTFSOURCE) \
+ 	splay.c \
+ 	Stack.c \
++	$(STRNSTRSOURCE) \
++	$(STRCASESTRSOURCE) \
+ 	$(STRSEPSOURCE) \
+ 	stub_memaccount.c \
+ 	util.c \
+@@ -443,6 +458,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splay.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspwin32.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnstr.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+-- src/Makefile.in.orig	Sat Nov  4 16:36:15 2006
++++ src/Makefile.in	Sat Nov  4 16:36:27 2006
+@@ -91,14 +91,15 @@
+ 	globals.h gopher.c helper.c htcp.c http.c HttpStatusLine.c \
+ 	HttpHdrCc.c HttpHdrRange.c HttpHdrContRange.c HttpHeader.c \
+ 	HttpHeaderTools.c HttpBody.c HttpMsg.c HttpReply.c \
+-	HttpRequest.c icmp.c icp_v2.c icp_v3.c ident.c internal.c \
+-	ipc.c ipc_win32.c ipcache.c leakfinder.c locrewrite.c \
+-	logfile.c main.c mem.c MemPool.c MemBuf.c mime.c multicast.c \
+-	neighbors.c net_db.c Packer.c pconn.c peer_digest.c \
+-	peer_monitor.c peer_select.c peer_sourcehash.c peer_userhash.c \
+-	protos.h redirect.c referer.c refresh.c send-announce.c \
+-	snmp_core.c snmp_agent.c squid.h ssl.c ssl_support.c stat.c \
+-	StatHist.c String.c stmem.c store.c store_io.c store_client.c \
++	HttpRequest.c icap_common.c icap_reqmod.c icap_respmod.c \
++	icap_opt.c icmp.c icp_v2.c icp_v3.c ident.c internal.c ipc.c \
++	ipc_win32.c ipcache.c leakfinder.c locrewrite.c logfile.c \
++	main.c mem.c MemPool.c MemBuf.c mime.c multicast.c neighbors.c \
++	net_db.c Packer.c pconn.c peer_digest.c peer_monitor.c \
++	peer_select.c peer_sourcehash.c peer_userhash.c protos.h \
++	redirect.c referer.c refresh.c send-announce.c snmp_core.c \
++	snmp_agent.c squid.h ssl.c ssl_support.c stat.c StatHist.c \
++	String.c stmem.c store.c store_io.c store_client.c \
+ 	store_digest.c store_dir.c store_key_md5.c store_log.c \
+ 	store_rebuild.c store_swapin.c store_swapmeta.c \
+ 	store_swapout.c structs.h tools.c typedefs.h unlinkd.c url.c \
+@@ -114,14 +115,17 @@
+ @USE_DNSSERVER_FALSE@am__objects_3 = dns_internal.$(OBJEXT)
+ @USE_DNSSERVER_TRUE@am__objects_3 = dns.$(OBJEXT)
+ @ENABLE_HTCP_TRUE@am__objects_4 = htcp.$(OBJEXT)
+-@ENABLE_MINGW32SPECIFIC_FALSE@am__objects_5 = ipc.$(OBJEXT)
+-@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_5 = ipc_win32.$(OBJEXT)
+-@MAKE_LEAKFINDER_TRUE@am__objects_6 = leakfinder.$(OBJEXT)
+-@USE_SNMP_TRUE@am__objects_7 = snmp_core.$(OBJEXT) \
++@USE_ICAP_TRUE@am__objects_5 = icap_common.$(OBJEXT) \
++@USE_ICAP_TRUE@	icap_reqmod.$(OBJEXT) icap_respmod.$(OBJEXT) \
++@USE_ICAP_TRUE@	icap_opt.$(OBJEXT)
++@ENABLE_MINGW32SPECIFIC_FALSE@am__objects_6 = ipc.$(OBJEXT)
++@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_6 = ipc_win32.$(OBJEXT)
++@MAKE_LEAKFINDER_TRUE@am__objects_7 = leakfinder.$(OBJEXT)
++@USE_SNMP_TRUE@am__objects_8 = snmp_core.$(OBJEXT) \
+ @USE_SNMP_TRUE@	snmp_agent.$(OBJEXT)
+-@ENABLE_SSL_TRUE@am__objects_8 = ssl_support.$(OBJEXT)
+-@ENABLE_UNLINKD_TRUE@am__objects_9 = unlinkd.$(OBJEXT)
+-@ENABLE_WIN32SPECIFIC_TRUE@am__objects_10 = win32.$(OBJEXT)
++@ENABLE_SSL_TRUE@am__objects_9 = ssl_support.$(OBJEXT)
++@ENABLE_UNLINKD_TRUE@am__objects_10 = unlinkd.$(OBJEXT)
++@ENABLE_WIN32SPECIFIC_TRUE@am__objects_11 = win32.$(OBJEXT)
+ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
+ 	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \
+ 	CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
+@@ -136,27 +140,27 @@
+ 	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
+ 	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
+ 	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
+-	HttpRequest.$(OBJEXT) icmp.$(OBJEXT) icp_v2.$(OBJEXT) \
+-	icp_v3.$(OBJEXT) ident.$(OBJEXT) internal.$(OBJEXT) \
+-	$(am__objects_5) ipcache.$(OBJEXT) $(am__objects_6) \
+-	locrewrite.$(OBJEXT) logfile.$(OBJEXT) main.$(OBJEXT) \
+-	mem.$(OBJEXT) MemPool.$(OBJEXT) MemBuf.$(OBJEXT) \
+-	mime.$(OBJEXT) multicast.$(OBJEXT) neighbors.$(OBJEXT) \
+-	net_db.$(OBJEXT) Packer.$(OBJEXT) pconn.$(OBJEXT) \
+-	peer_digest.$(OBJEXT) peer_monitor.$(OBJEXT) \
++	HttpRequest.$(OBJEXT) $(am__objects_5) icmp.$(OBJEXT) \
++	icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) ident.$(OBJEXT) \
++	internal.$(OBJEXT) $(am__objects_6) ipcache.$(OBJEXT) \
++	$(am__objects_7) locrewrite.$(OBJEXT) logfile.$(OBJEXT) \
++	main.$(OBJEXT) mem.$(OBJEXT) MemPool.$(OBJEXT) \
++	MemBuf.$(OBJEXT) mime.$(OBJEXT) multicast.$(OBJEXT) \
++	neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \
++	pconn.$(OBJEXT) peer_digest.$(OBJEXT) peer_monitor.$(OBJEXT) \
+ 	peer_select.$(OBJEXT) peer_sourcehash.$(OBJEXT) \
+ 	peer_userhash.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
+-	refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_7) \
+-	ssl.$(OBJEXT) $(am__objects_8) stat.$(OBJEXT) \
++	refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_8) \
++	ssl.$(OBJEXT) $(am__objects_9) stat.$(OBJEXT) \
+ 	StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \
+ 	store.$(OBJEXT) store_io.$(OBJEXT) store_client.$(OBJEXT) \
+ 	store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
+ 	store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
+ 	store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
+ 	store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
+-	tools.$(OBJEXT) $(am__objects_9) url.$(OBJEXT) urn.$(OBJEXT) \
++	tools.$(OBJEXT) $(am__objects_10) url.$(OBJEXT) urn.$(OBJEXT) \
+ 	useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
+-	wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_10)
++	wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_11)
+ nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \
+ 	store_modules.$(OBJEXT) globals.$(OBJEXT) \
+ 	string_arrays.$(OBJEXT)
+@@ -282,6 +286,10 @@
+ NEED_OWN_MD5_TRUE = @NEED_OWN_MD5_TRUE@
+ NEED_OWN_SNPRINTF_FALSE = @NEED_OWN_SNPRINTF_FALSE@
+ NEED_OWN_SNPRINTF_TRUE = @NEED_OWN_SNPRINTF_TRUE@
++NEED_OWN_STRCASESTR_FALSE = @NEED_OWN_STRCASESTR_FALSE@
++NEED_OWN_STRCASESTR_TRUE = @NEED_OWN_STRCASESTR_TRUE@
++NEED_OWN_STRNSTR_FALSE = @NEED_OWN_STRNSTR_FALSE@
++NEED_OWN_STRNSTR_TRUE = @NEED_OWN_STRNSTR_TRUE@
+ NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
+ NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
+ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
+@@ -321,6 +329,8 @@
+ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
+ USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
+ USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
++USE_ICAP_FALSE = @USE_ICAP_FALSE@
++USE_ICAP_TRUE = @USE_ICAP_TRUE@
+ USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
+ USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
+ USE_POLL_FALSE = @USE_POLL_FALSE@
+@@ -376,6 +386,8 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++@USE_ICAP_FALSE@ICAPSOURCE = 
++@USE_ICAP_TRUE@ICAPSOURCE = icap_common.c icap_reqmod.c icap_respmod.c icap_opt.c
+ @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
+ @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
+ @USE_DNSSERVER_FALSE@DNSSERVER = 
+@@ -479,6 +491,7 @@
+ 	HttpMsg.c \
+ 	HttpReply.c \
+ 	HttpRequest.c \
++	$(ICAPSOURCE) \
+ 	icmp.c \
+ 	icp_v2.c \
+ 	icp_v3.c \
+@@ -791,6 +804,10 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htcp.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icap_common.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icap_opt.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icap_reqmod.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icap_respmod.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icp_v2.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icp_v3.Po@am__quote@
diff --git a/www/squid30/files/icap-2.5-core.patch b/www/squid30/files/icap-2.6-core.patch
index 72fdb8065b08..4287961a3b53 100644
--- a/www/squid30/files/icap-2.5-core.patch
+++ b/www/squid30/files/icap-2.6-core.patch
@@ -1,4 +1,4 @@
-Patch 1 of 2 to integrate the icap-2_5 branch into the FreeBSD squid port.
+Patch 1 of 2 to integrate the icap-2_6 branch into the FreeBSD squid port.
 
 Created by Thomas-Martin Seck <tmseck@netcologne.de>.
 
@@ -6,28 +6,24 @@ This patch only contains the parts of the original patchset that
 actually implement the ICAP client functionality. The updates to
 the build infrastructure are omitted to avoid the need to run an
 autotools bootstrap.  Instead, we simulate said bootstrapping with
-a second patch, icap-2.5-bootstrap.patch.
+a second patch, icap-2.6-bootstrap.patch.
 
-The patchset was pulled from the project's CVS repository
+The complete patchset was pulled from the project's CVS repository
 at cvs.devel.squid-cache.org using
 
-cvs diff -u -b -N -kk -rs2_5 -ricap-2_5
-
-See also
-<http://devel.squid-cache.org/cgi-bin/diff2/icap-2_5.patch?s2_5>
-for the "official" auto-generated patchset.
+cvs diff -u -b -N -kk -rZ-icap-2_6_merge_HEAD -ricap-2_6
 
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-06-01
+Patch last updated: 2007-01-24
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
 RCS file: errors/Azerbaijani/ERR_ICAP_FAILURE
 diff -N errors/Azerbaijani/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Azerbaijani/ERR_ICAP_FAILURE	8 Dec 2003 12:30:56 -0000	1.1.2.1
++++ errors/Azerbaijani/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -65,7 +61,7 @@ Index: errors/Bulgarian/ERR_ICAP_FAILURE
 RCS file: errors/Bulgarian/ERR_ICAP_FAILURE
 diff -N errors/Bulgarian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Bulgarian/ERR_ICAP_FAILURE	8 Dec 2003 12:30:56 -0000	1.1.2.1
++++ errors/Bulgarian/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -103,7 +99,7 @@ Index: errors/Catalan/ERR_ICAP_FAILURE
 RCS file: errors/Catalan/ERR_ICAP_FAILURE
 diff -N errors/Catalan/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Catalan/ERR_ICAP_FAILURE	8 Dec 2003 12:30:57 -0000	1.1.2.1
++++ errors/Catalan/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -141,7 +137,7 @@ Index: errors/Czech/ERR_ICAP_FAILURE
 RCS file: errors/Czech/ERR_ICAP_FAILURE
 diff -N errors/Czech/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Czech/ERR_ICAP_FAILURE	8 Dec 2003 12:30:57 -0000	1.1.2.1
++++ errors/Czech/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -179,7 +175,7 @@ Index: errors/Danish/ERR_ICAP_FAILURE
 RCS file: errors/Danish/ERR_ICAP_FAILURE
 diff -N errors/Danish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Danish/ERR_ICAP_FAILURE	8 Dec 2003 12:30:57 -0000	1.1.2.1
++++ errors/Danish/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -217,7 +213,7 @@ Index: errors/Dutch/ERR_ICAP_FAILURE
 RCS file: errors/Dutch/ERR_ICAP_FAILURE
 diff -N errors/Dutch/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Dutch/ERR_ICAP_FAILURE	8 Dec 2003 12:30:57 -0000	1.1.2.1
++++ errors/Dutch/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -255,7 +251,7 @@ Index: errors/English/ERR_ICAP_FAILURE
 RCS file: errors/English/ERR_ICAP_FAILURE
 diff -N errors/English/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/English/ERR_ICAP_FAILURE	8 Dec 2003 12:30:57 -0000	1.1.2.2
++++ errors/English/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -293,7 +289,7 @@ Index: errors/Estonian/ERR_ICAP_FAILURE
 RCS file: errors/Estonian/ERR_ICAP_FAILURE
 diff -N errors/Estonian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Estonian/ERR_ICAP_FAILURE	8 Dec 2003 12:30:58 -0000	1.1.2.1
++++ errors/Estonian/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -331,7 +327,7 @@ Index: errors/Finnish/ERR_ICAP_FAILURE
 RCS file: errors/Finnish/ERR_ICAP_FAILURE
 diff -N errors/Finnish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Finnish/ERR_ICAP_FAILURE	8 Dec 2003 12:30:58 -0000	1.1.2.1
++++ errors/Finnish/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -369,7 +365,7 @@ Index: errors/French/ERR_ICAP_FAILURE
 RCS file: errors/French/ERR_ICAP_FAILURE
 diff -N errors/French/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/French/ERR_ICAP_FAILURE	8 Dec 2003 12:30:58 -0000	1.1.2.1
++++ errors/French/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -407,7 +403,7 @@ Index: errors/German/ERR_ICAP_FAILURE
 RCS file: errors/German/ERR_ICAP_FAILURE
 diff -N errors/German/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/German/ERR_ICAP_FAILURE	23 Mar 2004 08:20:05 -0000	1.1.2.2
++++ errors/German/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,33 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -447,7 +443,7 @@ Index: errors/Greek/ERR_ICAP_FAILURE
 RCS file: errors/Greek/ERR_ICAP_FAILURE
 diff -N errors/Greek/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Greek/ERR_ICAP_FAILURE	24 Sep 2005 10:31:00 -0000	1.1.2.1
++++ errors/Greek/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.12.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -485,7 +481,7 @@ Index: errors/Hebrew/ERR_ICAP_FAILURE
 RCS file: errors/Hebrew/ERR_ICAP_FAILURE
 diff -N errors/Hebrew/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Hebrew/ERR_ICAP_FAILURE	8 Dec 2003 12:30:59 -0000	1.1.2.1
++++ errors/Hebrew/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -523,7 +519,7 @@ Index: errors/Hungarian/ERR_ICAP_FAILURE
 RCS file: errors/Hungarian/ERR_ICAP_FAILURE
 diff -N errors/Hungarian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Hungarian/ERR_ICAP_FAILURE	8 Dec 2003 12:30:59 -0000	1.1.2.1
++++ errors/Hungarian/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -561,7 +557,7 @@ Index: errors/Italian/ERR_ICAP_FAILURE
 RCS file: errors/Italian/ERR_ICAP_FAILURE
 diff -N errors/Italian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Italian/ERR_ICAP_FAILURE	8 Dec 2003 12:31:00 -0000	1.1.2.1
++++ errors/Italian/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -599,7 +595,7 @@ Index: errors/Japanese/ERR_ICAP_FAILURE
 RCS file: errors/Japanese/ERR_ICAP_FAILURE
 diff -N errors/Japanese/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Japanese/ERR_ICAP_FAILURE	8 Dec 2003 12:31:00 -0000	1.1.2.1
++++ errors/Japanese/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -637,7 +633,7 @@ Index: errors/Korean/ERR_ICAP_FAILURE
 RCS file: errors/Korean/ERR_ICAP_FAILURE
 diff -N errors/Korean/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Korean/ERR_ICAP_FAILURE	8 Dec 2003 12:31:00 -0000	1.1.2.1
++++ errors/Korean/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -675,7 +671,7 @@ Index: errors/Lithuanian/ERR_ICAP_FAILURE
 RCS file: errors/Lithuanian/ERR_ICAP_FAILURE
 diff -N errors/Lithuanian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Lithuanian/ERR_ICAP_FAILURE	8 Dec 2003 12:31:00 -0000	1.1.2.1
++++ errors/Lithuanian/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -713,7 +709,7 @@ Index: errors/Polish/ERR_ICAP_FAILURE
 RCS file: errors/Polish/ERR_ICAP_FAILURE
 diff -N errors/Polish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Polish/ERR_ICAP_FAILURE	8 Dec 2003 12:31:00 -0000	1.1.2.1
++++ errors/Polish/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -751,7 +747,7 @@ Index: errors/Portuguese/ERR_ICAP_FAILURE
 RCS file: errors/Portuguese/ERR_ICAP_FAILURE
 diff -N errors/Portuguese/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Portuguese/ERR_ICAP_FAILURE	8 Dec 2003 12:31:01 -0000	1.1.2.1
++++ errors/Portuguese/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -789,7 +785,7 @@ Index: errors/Romanian/ERR_ICAP_FAILURE
 RCS file: errors/Romanian/ERR_ICAP_FAILURE
 diff -N errors/Romanian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Romanian/ERR_ICAP_FAILURE	8 Dec 2003 12:31:01 -0000	1.1.2.1
++++ errors/Romanian/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -827,7 +823,7 @@ Index: errors/Russian-1251/ERR_ICAP_FAILURE
 RCS file: errors/Russian-1251/ERR_ICAP_FAILURE
 diff -N errors/Russian-1251/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Russian-1251/ERR_ICAP_FAILURE	8 Dec 2003 12:31:02 -0000	1.1.2.1
++++ errors/Russian-1251/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -865,7 +861,7 @@ Index: errors/Russian-koi8-r/ERR_ICAP_FAILURE
 RCS file: errors/Russian-koi8-r/ERR_ICAP_FAILURE
 diff -N errors/Russian-koi8-r/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Russian-koi8-r/ERR_ICAP_FAILURE	8 Dec 2003 12:31:02 -0000	1.1.2.1
++++ errors/Russian-koi8-r/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -903,7 +899,7 @@ Index: errors/Serbian/ERR_ICAP_FAILURE
 RCS file: errors/Serbian/ERR_ICAP_FAILURE
 diff -N errors/Serbian/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Serbian/ERR_ICAP_FAILURE	8 Dec 2003 12:31:02 -0000	1.1.2.1
++++ errors/Serbian/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -941,7 +937,7 @@ Index: errors/Simplify_Chinese/ERR_ICAP_FAILURE
 RCS file: errors/Simplify_Chinese/ERR_ICAP_FAILURE
 diff -N errors/Simplify_Chinese/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Simplify_Chinese/ERR_ICAP_FAILURE	8 Dec 2003 12:31:02 -0000	1.1.2.1
++++ errors/Simplify_Chinese/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -979,7 +975,7 @@ Index: errors/Slovak/ERR_ICAP_FAILURE
 RCS file: errors/Slovak/ERR_ICAP_FAILURE
 diff -N errors/Slovak/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Slovak/ERR_ICAP_FAILURE	8 Dec 2003 12:31:03 -0000	1.1.2.1
++++ errors/Slovak/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -1017,7 +1013,7 @@ Index: errors/Spanish/ERR_ICAP_FAILURE
 RCS file: errors/Spanish/ERR_ICAP_FAILURE
 diff -N errors/Spanish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Spanish/ERR_ICAP_FAILURE	8 Dec 2003 12:31:03 -0000	1.1.2.1
++++ errors/Spanish/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -1055,7 +1051,7 @@ Index: errors/Swedish/ERR_ICAP_FAILURE
 RCS file: errors/Swedish/ERR_ICAP_FAILURE
 diff -N errors/Swedish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Swedish/ERR_ICAP_FAILURE	8 Dec 2003 12:31:03 -0000	1.1.2.1
++++ errors/Swedish/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -1093,7 +1089,7 @@ Index: errors/Traditional_Chinese/ERR_ICAP_FAILURE
 RCS file: errors/Traditional_Chinese/ERR_ICAP_FAILURE
 diff -N errors/Traditional_Chinese/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Traditional_Chinese/ERR_ICAP_FAILURE	8 Dec 2003 12:31:03 -0000	1.1.2.1
++++ errors/Traditional_Chinese/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -1131,7 +1127,7 @@ Index: errors/Turkish/ERR_ICAP_FAILURE
 RCS file: errors/Turkish/ERR_ICAP_FAILURE
 diff -N errors/Turkish/ERR_ICAP_FAILURE
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ errors/Turkish/ERR_ICAP_FAILURE	8 Dec 2003 12:31:04 -0000	1.1.2.1
++++ errors/Turkish/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,31 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<HTML><HEAD>
@@ -1167,14 +1163,14 @@ diff -N errors/Turkish/ERR_ICAP_FAILURE
 Index: include/util.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/include/util.h,v
-retrieving revision 1.10.6.1
-retrieving revision 1.10.30.3
-diff -p -u -b -r1.10.6.1 -r1.10.30.3
---- include/util.h	12 May 2006 16:51:32 -0000	1.10.6.1
-+++ include/util.h	16 May 2006 17:56:57 -0000	1.10.30.3
-@@ -123,4 +123,12 @@ double drand48(void);
-  */
- int statMemoryAccounted(void);
+retrieving revision 1.17
+retrieving revision 1.13.8.3
+diff -p -u -b -r1.17 -r1.13.8.3
+--- include/util.h	10 Dec 2006 13:56:25 -0000	1.17
++++ include/util.h	12 Dec 2006 22:49:41 -0000	1.13.8.3
+@@ -157,4 +157,12 @@ extern void WIN32_maperror(unsigned long
+ extern int WIN32_Close_FD_Socket(int);
+ #endif
  
 +#ifndef HAVE_STRNSTR
 +extern char *strnstr(const char *haystack, const char *needle, size_t haystacklen);
@@ -1190,7 +1186,7 @@ Index: lib/strcasestr.c
 RCS file: lib/strcasestr.c
 diff -N lib/strcasestr.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ lib/strcasestr.c	6 Apr 2004 13:04:38 -0000	1.1.2.1
++++ lib/strcasestr.c	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,126 @@
 +/* Return the offset of one string within another.
 +   Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
@@ -1323,7 +1319,7 @@ Index: lib/strnstr.c
 RCS file: lib/strnstr.c
 diff -N lib/strnstr.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ lib/strnstr.c	16 May 2005 20:52:40 -0000	1.1.2.2
++++ lib/strnstr.c	17 May 2006 17:58:00 -0000	1.1.14.1
 @@ -0,0 +1,52 @@
 +/*
 + *  Copyright (C) 2003 Nikos Mavroyanopoulos
@@ -1380,12 +1376,12 @@ diff -N lib/strnstr.c
 Index: src/MemBuf.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/MemBuf.c,v
-retrieving revision 1.5.30.3
-retrieving revision 1.5.44.8
-diff -p -u -b -r1.5.30.3 -r1.5.44.8
---- src/MemBuf.c	26 Mar 2005 03:15:54 -0000	1.5.30.3
-+++ src/MemBuf.c	28 Mar 2005 18:02:04 -0000	1.5.44.8
-@@ -386,3 +386,15 @@ memBufReport(MemBuf * mb)
+retrieving revision 1.11
+retrieving revision 1.9.10.4
+diff -p -u -b -r1.11 -r1.9.10.4
+--- src/MemBuf.c	16 Aug 2006 00:53:02 -0000	1.11
++++ src/MemBuf.c	21 Aug 2006 19:48:09 -0000	1.9.10.4
+@@ -341,3 +341,15 @@ memBufReport(MemBuf * mb)
      assert(mb);
      memBufPrintf(mb, "memBufReport is not yet implemented @?@\n");
  }
@@ -1397,19 +1393,19 @@ diff -p -u -b -r1.5.30.3 -r1.5.44.8
 +    if (mb->capacity == mb->size)
 +	memBufGrow(mb, SQUID_TCP_SO_RCVBUF);
 +    len = FD_READ_METHOD(fd, mb->buf + mb->size, mb->capacity - mb->size);
-+    if (len)
++    if (len > 0)
 +	mb->size += len;
 +    return len;
 +}
 Index: src/cache_cf.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/cache_cf.c,v
-retrieving revision 1.38.6.29
-retrieving revision 1.38.6.11.2.22
-diff -p -u -b -r1.38.6.29 -r1.38.6.11.2.22
---- src/cache_cf.c	27 Oct 2005 02:13:24 -0000	1.38.6.29
-+++ src/cache_cf.c	23 Nov 2005 20:38:56 -0000	1.38.6.11.2.22
-@@ -2198,6 +2198,587 @@ check_null_body_size_t(dlink_list bodyli
+retrieving revision 1.86
+retrieving revision 1.61.4.12
+diff -p -u -b -r1.86 -r1.61.4.12
+--- src/cache_cf.c	10 Dec 2006 05:51:43 -0000	1.86
++++ src/cache_cf.c	12 Dec 2006 22:49:42 -0000	1.61.4.12
+@@ -2389,6 +2389,587 @@ check_null_body_size_t(dlink_list bodyli
      return bodylist.head == NULL;
  }
  
@@ -1425,7 +1421,7 @@ diff -p -u -b -r1.38.6.29 -r1.38.6.11.2.22
 +static int icap_class_process(icap_class * c);
 +static void icap_class_destroy(icap_class * c);
 +static void icap_access_destroy(icap_access * a);
-+static void dump_wordlist(StoreEntry * entry, const char *name, wordlist * list);
++static void dump_wordlist(StoreEntry * entry, const char *name, const wordlist * list);
 +static void icap_class_add(icap_class * c);
 +
 +/***************************************************
@@ -2000,12 +1996,12 @@ diff -p -u -b -r1.38.6.29 -r1.38.6.11.2.22
 Index: src/cbdata.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/cbdata.c,v
-retrieving revision 1.14.6.1
-retrieving revision 1.14.32.2
-diff -p -u -b -r1.14.6.1 -r1.14.32.2
---- src/cbdata.c	17 Jul 2003 02:13:28 -0000	1.14.6.1
-+++ src/cbdata.c	14 Sep 2003 01:36:26 -0000	1.14.32.2
-@@ -144,6 +144,10 @@ cbdataInit(void)
+retrieving revision 1.18
+retrieving revision 1.18.8.1
+diff -p -u -b -r1.18 -r1.18.8.1
+--- src/cbdata.c	12 May 2006 22:51:56 -0000	1.18
++++ src/cbdata.c	17 May 2006 17:58:00 -0000	1.18.8.1
+@@ -179,6 +179,10 @@ cbdataInit(void)
      CREATE_CBDATA(statefulhelper);
      CREATE_CBDATA(helper_stateful_server);
      CREATE_CBDATA(HttpStateData);
@@ -2019,20 +2015,20 @@ diff -p -u -b -r1.14.6.1 -r1.14.32.2
 Index: src/cf.data.pre
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
-retrieving revision 1.49.2.86
-retrieving revision 1.49.2.33.2.34
-diff -p -u -b -r1.49.2.86 -r1.49.2.33.2.34
---- src/cf.data.pre	26 Feb 2006 03:13:57 -0000	1.49.2.86
-+++ src/cf.data.pre	16 May 2006 17:56:57 -0000	1.49.2.33.2.34
-@@ -2397,7 +2397,6 @@ DOC_START
- 	ensure correct results it is best to set server_persisten_connections
+retrieving revision 1.161
+retrieving revision 1.100.4.12
+diff -p -u -b -r1.161 -r1.100.4.12
+--- src/cf.data.pre	29 Nov 2006 00:52:57 -0000	1.161
++++ src/cf.data.pre	12 Dec 2006 22:49:42 -0000	1.100.4.12
+@@ -3189,7 +3189,6 @@ DOC_START
+ 	ensure correct results it is best to set server_persistent_connections
  	to off when using this directive in such configurations.
  DOC_END
 -
  NAME: reply_header_max_size
  COMMENT: (KB)
  TYPE: b_size_t
-@@ -2716,6 +2715,187 @@ DOC_START
+@@ -3458,6 +3457,187 @@ DOC_START
  DOC_END
  
  COMMENT_START
@@ -2223,35 +2219,27 @@ diff -p -u -b -r1.49.2.86 -r1.49.2.33.2.34
 Index: src/cf_gen_defines
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/cf_gen_defines,v
-retrieving revision 1.5
-retrieving revision 1.5.48.3
-diff -p -u -b -r1.5 -r1.5.48.3
---- src/cf_gen_defines	3 Dec 2001 08:03:21 -0000	1.5
-+++ src/cf_gen_defines	13 Mar 2005 17:58:44 -0000	1.5.48.3
-@@ -18,12 +18,13 @@ BEGIN {
- 	define["USE_UNLINKD"]="--enable-unlinkd"
- 	define["USE_USERAGENT_LOG"]="--enable-useragent-log"
+retrieving revision 1.7
+retrieving revision 1.6.8.2
+diff -p -u -b -r1.7 -r1.6.8.2
+--- src/cf_gen_defines	31 May 2006 19:51:14 -0000	1.7
++++ src/cf_gen_defines	4 Jun 2006 14:15:43 -0000	1.6.8.2
+@@ -22,6 +22,7 @@ BEGIN {
  	define["USE_WCCP"]="--enable-wccp"
+ 	define["USE_WCCPv2"]="--enable-wccpv2"
+ 	define["WIP_FWD_LOG"]="--enable-forward-log"
 +	define["HS_FEAT_ICAP"]="--enable-icap-support"
  }
  /^IFDEF:/ {
  	if (define[$2] != "")
--	    DEFINE=define[$2]
-+	    DEFINE = define[$2]
- 	else  
--	    DEFINE="-D" $2
-+	    DEFINE = "-D" $2
- 	print "{\"" $2 "\", \"" DEFINE "\", "
- 	print "#if " $2
- 	print "1"
 Index: src/client_side.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/client_side.c,v
-retrieving revision 1.47.2.76
-retrieving revision 1.47.2.28.2.41
-diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
---- src/client_side.c	11 Mar 2006 03:16:31 -0000	1.47.2.76
-+++ src/client_side.c	16 May 2006 17:56:58 -0000	1.47.2.28.2.41
+retrieving revision 1.154
+retrieving revision 1.89.4.14
+diff -p -u -b -r1.154 -r1.89.4.14
+--- src/client_side.c	11 Dec 2006 00:53:11 -0000	1.154
++++ src/client_side.c	12 Dec 2006 22:49:44 -0000	1.89.4.14
 @@ -109,7 +109,7 @@ static const char *const crlf = "\r\n";
  static CWCB clientWriteComplete;
  static CWCB clientWriteBodyComplete;
@@ -2261,7 +2249,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  static PF requestTimeout;
  static PF clientLifetimeTimeout;
  static int clientCheckTransferDone(clientHttpRequest *);
-@@ -136,20 +136,23 @@ static void clientSetKeepaliveFlag(clien
+@@ -141,12 +141,12 @@ static void clientSetKeepaliveFlag(clien
  static void clientPackRangeHdr(const HttpReply * rep, const HttpHdrRangeSpec * spec, String boundary, MemBuf * mb);
  static void clientPackTermBound(String boundary, MemBuf * mb);
  static void clientInterpretRequestHeaders(clientHttpRequest *);
@@ -2278,21 +2266,39 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  static DEFER httpAcceptDefer;
  static log_type clientProcessRequest2(clientHttpRequest * http);
  static int clientReplyBodyTooLarge(clientHttpRequest *, squid_off_t clen);
- static int clientRequestBodyTooLarge(squid_off_t clen);
- static void clientProcessBody(ConnStateData * conn);
- static void clientEatRequestBody(clientHttpRequest *);
+@@ -157,15 +157,18 @@ static void clientAccessCheck(void *data
+ static void clientAccessCheckDone(int answer, void *data);
+ static void clientAccessCheck2(void *data);
+ static void clientAccessCheckDone2(int answer, void *data);
 -static BODY_HANDLER clientReadBody;
 +BODY_HANDLER clientReadBody;
  static void clientAbortBody(request_t * req);
+ #if USE_SSL
+ static void httpsAcceptSSL(ConnStateData * connState, SSL_CTX * sslContext);
+ #endif
+ static int varyEvaluateMatch(StoreEntry * entry, request_t * request);
+ static int modifiedSince(StoreEntry *, request_t *);
+-static StoreEntry *clientCreateStoreEntry(clientHttpRequest *, method_t, request_flags);
++StoreEntry *clientCreateStoreEntry(clientHttpRequest *, method_t, request_flags);
+ static inline int clientNatLookup(ConnStateData * conn);
 +#if HS_FEAT_ICAP
 +static int clientIcapReqMod(clientHttpRequest * http);
 +#endif
  
- static int
- checkAccelOnly(clientHttpRequest * http)
-@@ -392,6 +395,10 @@ clientRedirectDone(void *data, char *res
- 	http->request = requestLink(new_request);
-     }
+ #if USE_IDENT
+ static void
+@@ -383,7 +386,7 @@ clientOnlyIfCached(clientHttpRequest * h
+ 	EBIT_TEST(r->cache_control->mask, CC_ONLY_IF_CACHED);
+ }
+ 
+-static StoreEntry *
++StoreEntry *
+ clientCreateStoreEntry(clientHttpRequest * h, method_t m, request_flags flags)
+ {
+     StoreEntry *e;
+@@ -638,6 +641,10 @@ clientRedirectDone(void *data, char *res
+     if (urlgroup && *urlgroup)
+ 	http->request->urlgroup = xstrdup(urlgroup);
      clientInterpretRequestHeaders(http);
 +#if HS_FEAT_ICAP
 +    if (Config.icapcfg.onoff)
@@ -2301,9 +2307,9 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  #if HEADERS_LOG
      headersLog(0, 1, request->method, request);
  #endif
-@@ -936,11 +943,22 @@ httpRequestFree(void *data)
-     *H = http->next;
-     http->next = NULL;
+@@ -1352,11 +1359,22 @@ httpRequestFree(void *data)
+     /* Unlink us from the clients request list */
+     dlinkDelete(&http->node, &http->conn->reqs);
      dlinkDelete(&http->active, &ClientActiveRequests);
 +#if HS_FEAT_ICAP
 +    /*In the case that the upload of data breaks, we need this code here ....  */
@@ -2325,15 +2331,18 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  connStateFree(int fd, void *data)
  {
      ConnStateData *connState = data;
-@@ -963,7 +981,6 @@ connStateFree(int fd, void *data)
-     } else
- 	safe_free(connState->in.buf);
-     /* XXX account connState->in.buf */
+@@ -1376,8 +1394,9 @@ connStateFree(int fd, void *data)
+ 	authenticateAuthUserRequestUnlock(connState->auth_user_request);
+     connState->auth_user_request = NULL;
+     authenticateOnCloseConnection(connState);
++    if (connState->in.buf)
+     memFreeBuf(connState->in.size, connState->in.buf);
 -    pconnHistCount(0, connState->nrequests);
++/*  pconnHistCount(0, connState->nrequests);*/
+     if (connState->pinning.fd >= 0)
+ 	comm_close(connState->pinning.fd);
      cbdataFree(connState);
- #ifdef _SQUID_LINUX_
-     /* prevent those nasty RST packets */
-@@ -1108,7 +1125,7 @@ clientSetKeepaliveFlag(clientHttpRequest
+@@ -1575,7 +1594,7 @@ clientSetKeepaliveFlag(clientHttpRequest
      }
  }
  
@@ -2342,7 +2351,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientCheckContentLength(request_t * r)
  {
      switch (r->method) {
-@@ -1127,7 +1144,7 @@ clientCheckContentLength(request_t * r)
+@@ -1594,7 +1613,7 @@ clientCheckContentLength(request_t * r)
      /* NOT REACHED */
  }
  
@@ -2351,7 +2360,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientCachable(clientHttpRequest * http)
  {
      request_t *req = http->request;
-@@ -1153,7 +1170,7 @@ clientCachable(clientHttpRequest * http)
+@@ -1620,7 +1639,7 @@ clientCachable(clientHttpRequest * http)
  }
  
  /* Return true if we can query our neighbors for this object */
@@ -2360,7 +2369,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientHierarchical(clientHttpRequest * http)
  {
      const char *url = http->uri;
-@@ -2447,7 +2464,7 @@ clientProcessRequest2(clientHttpRequest 
+@@ -3307,7 +3326,7 @@ clientProcessRequest2(clientHttpRequest 
      return LOG_TCP_HIT;
  }
  
@@ -2369,10 +2378,10 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientProcessRequest(clientHttpRequest * http)
  {
      char *url = http->uri;
-@@ -2457,6 +2474,11 @@ clientProcessRequest(clientHttpRequest *
-     debug(33, 4) ("clientProcessRequest: %s '%s'\n",
+@@ -3318,6 +3337,11 @@ clientProcessRequest(clientHttpRequest *
  	RequestMethodStr[r->method],
  	url);
+     r->flags.collapsed = 0;
 +#if HS_FEAT_ICAP
 +    if (clientIcapReqMod(http)) {
 +	return;
@@ -2380,8 +2389,8 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
 +#endif
      if (r->method == METHOD_CONNECT && !http->redirect.status) {
  	http->log_type = LOG_TCP_MISS;
- 	sslStart(http, &http->out.size, &http->al.http.code);
-@@ -3001,6 +3023,20 @@ clientReadRequest(int fd, void *data)
+ #if USE_SSL && SSL_CONNECT_INTERCEPT
+@@ -3812,6 +3836,20 @@ clientReadRequest(int fd, void *data)
  	    (long) conn->in.offset, (long) conn->in.size);
  	len = conn->in.size - conn->in.offset - 1;
      }
@@ -2402,17 +2411,17 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
      statCounter.syscalls.sock.reads++;
      size = FD_READ_METHOD(fd, conn->in.buf + conn->in.offset, len);
      if (size > 0) {
-@@ -3104,7 +3140,8 @@ clientReadRequest(int fd, void *data)
+@@ -3916,7 +3954,8 @@ clientReadRequest(int fd, void *data)
  	    /* add to the client request queue */
- 	    for (H = &conn->chr; *H; H = &(*H)->next);
- 	    *H = http;
--	    conn->nrequests++;
+ 	    dlinkAddTail(http, &http->node, &conn->reqs);
+ 	    conn->nrequests++;
+-	    commSetTimeout(fd, Config.Timeout.lifetime, clientLifetimeTimeout, http);
 +	    F->pconn.uses++;
-+	    F->pconn.type = 0;
- 	    /*
- 	     * I wanted to lock 'http' here since its callback data for 
- 	     * clientLifetimeTimeout(), but there's no logical place to
-@@ -3274,7 +3311,7 @@ clientReadRequest(int fd, void *data)
++            F->pconn.type = 0;
+ 	    if (parser_return_code < 0) {
+ 		debug(33, 1) ("clientReadRequest: FD %d (%s:%d) Invalid Request\n", fd, fd_table[fd].ipaddr, fd_table[fd].remote_port);
+ 		err = errorCon(ERR_INVALID_REQ, HTTP_BAD_REQUEST, NULL);
+@@ -4086,7 +4125,7 @@ clientReadRequest(int fd, void *data)
  }
  
  /* file_read like function, for reading body content */
@@ -2421,7 +2430,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientReadBody(request_t * request, char *buf, size_t size, CBCB * callback, void *cbdata)
  {
      ConnStateData *conn = request->body_reader_data;
-@@ -3398,7 +3435,7 @@ clientProcessBody(ConnStateData * conn)
+@@ -4215,7 +4254,7 @@ clientProcessBody(ConnStateData * conn)
  }
  
  /* Abort a body request */
@@ -2430,7 +2439,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  clientAbortBody(request_t * request)
  {
      ConnStateData *conn = request->body_reader_data;
-@@ -3440,7 +3477,7 @@ requestTimeout(int fd, void *data)
+@@ -4257,7 +4296,7 @@ requestTimeout(int fd, void *data)
  	 * Some data has been sent to the client, just close the FD
  	 */
  	comm_close(fd);
@@ -2439,11 +2448,10 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
  	/*
  	 * assume its a persistent connection; just close it
  	 */
-@@ -3956,3 +3993,49 @@ varyEvaluateMatch(StoreEntry * entry, re
- 	}
+@@ -4978,6 +5017,52 @@ varyEvaluateMatch(StoreEntry * entry, re
      }
  }
-+
+ 
 +#if HS_FEAT_ICAP
 +static int
 +clientIcapReqMod(clientHttpRequest * http)
@@ -2476,7 +2484,7 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
 +	http->icap_reqmod = NULL;
 +	debug(33, 2) ("clientIcapReqMod: icap told us to send an error\n");
 +	http->log_type = LOG_TCP_DENIED;
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, http->orig_request);
 +	err->xerrno = ETIMEDOUT;
 +	err->request = requestLink(http->request);
 +	err->src_addr = http->conn->peer.sin_addr;
@@ -2489,16 +2497,20 @@ diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41
 +    return 1;
 +}
 +#endif
++
+ /* This is a handler normally called by comm_close() */
+ static void
+ clientPinnedConnectionClosed(int fd, void *data)
 Index: src/comm.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/comm.c,v
-retrieving revision 1.18.6.6
-retrieving revision 1.18.6.2.12.9
-diff -p -u -b -r1.18.6.6 -r1.18.6.2.12.9
---- src/comm.c	11 Sep 2005 02:13:22 -0000	1.18.6.6
-+++ src/comm.c	23 Nov 2005 20:33:06 -0000	1.18.6.2.12.9
-@@ -653,8 +653,8 @@ comm_close(int fd)
- #endif
+retrieving revision 1.49
+retrieving revision 1.29.10.9
+diff -p -u -b -r1.49 -r1.29.10.9
+--- src/comm.c	23 Oct 2006 11:52:53 -0000	1.49
++++ src/comm.c	3 Nov 2006 18:47:12 -0000	1.29.10.9
+@@ -742,8 +742,8 @@ comm_close(int fd)
+     F->flags.closing = 1;
      CommWriteStateCallbackAndFree(fd, COMM_ERR_CLOSING);
      commCallCloseHandlers(fd);
 -    if (F->uses)		/* assume persistent connect count */
@@ -2507,15 +2519,15 @@ diff -p -u -b -r1.18.6.6 -r1.18.6.2.12.9
 +	pconnHistCount(F->pconn.type, F->pconn.uses);
  #if USE_SSL
      if (F->ssl) {
- 	SSL_free(F->ssl);
+ 	if (!F->flags.close_request) {
 Index: src/enums.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/enums.h,v
-retrieving revision 1.29.2.18
-retrieving revision 1.29.2.8.2.17
-diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
---- src/enums.h	12 Nov 2005 03:13:48 -0000	1.29.2.18
-+++ src/enums.h	23 Nov 2005 20:38:56 -0000	1.29.2.8.2.17
+retrieving revision 1.57
+retrieving revision 1.45.4.6
+diff -p -u -b -r1.57 -r1.45.4.6
+--- src/enums.h	30 Sep 2006 21:52:28 -0000	1.57
++++ src/enums.h	3 Nov 2006 18:47:13 -0000	1.45.4.6
 @@ -93,6 +93,7 @@ typedef enum {
      ERR_ONLY_IF_CACHED_MISS,	/* failure to satisfy only-if-cached request */
      ERR_TOO_BIG,
@@ -2524,7 +2536,7 @@ diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
      ERR_INVALID_RESP,
      ERR_MAX
  } err_type;
-@@ -438,6 +439,9 @@ typedef enum {
+@@ -455,6 +456,9 @@ typedef enum {
      PROTO_WHOIS,
      PROTO_INTERNAL,
      PROTO_HTTPS,
@@ -2534,10 +2546,10 @@ diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
      PROTO_MAX
  } protocol_t;
  
-@@ -610,6 +614,12 @@ typedef enum {
-     MEM_TLV,
-     MEM_SWAP_LOG_DATA,
-     MEM_CLIENT_REQ_BUF,
+@@ -630,6 +634,12 @@ typedef enum {
+ #if USE_SSL
+     MEM_ACL_CERT_DATA,
+ #endif
 +#if HS_FEAT_ICAP
 +    MEM_ICAP_OPT_DATA,
 +    MEM_ICAP_SERVICE_LIST,
@@ -2547,7 +2559,7 @@ diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
      MEM_MAX
  } mem_type;
  
-@@ -709,9 +719,14 @@ typedef enum {
+@@ -730,9 +740,14 @@ typedef enum {
      CBDATA_RemovalPolicyWalker,
      CBDATA_RemovalPurgeWalker,
      CBDATA_store_client,
@@ -2562,9 +2574,9 @@ diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
  /*
   * Return codes from checkVary(request)
   */
-@@ -742,4 +757,68 @@ enum {
- 
- #endif
+@@ -781,4 +796,68 @@ typedef enum {
+     ST_OP_CREATE
+ } store_op_t;
  
 +#if HS_FEAT_ICAP
 +typedef enum {
@@ -2634,22 +2646,24 @@ diff -p -u -b -r1.29.2.18 -r1.29.2.8.2.17
 Index: src/forward.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/forward.c,v
-retrieving revision 1.13.6.16
-retrieving revision 1.13.6.3.2.16
-diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.16
---- src/forward.c	11 Mar 2006 03:16:31 -0000	1.13.6.16
-+++ src/forward.c	16 May 2006 17:56:58 -0000	1.13.6.3.2.16
-@@ -251,7 +251,8 @@ fwdConnectDone(int server_fd, int status
+retrieving revision 1.43
+retrieving revision 1.20.4.10
+diff -p -u -b -r1.43 -r1.20.4.10
+--- src/forward.c	10 Dec 2006 05:51:43 -0000	1.43
++++ src/forward.c	12 Dec 2006 22:49:45 -0000	1.20.4.10
+@@ -358,8 +358,9 @@ fwdConnectDone(int server_fd, int status
      } else {
  	debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry));
  	fd_note(server_fd, storeUrl(fwdState->entry));
 -	fd_table[server_fd].uses++;
+-	if (fd_table[server_fd].uses == 1 && fs->peer)
 +	fd_table[server_fd].pconn.uses++;
 +	fd_table[server_fd].pconn.type = 1;
- 	if (fs->peer)
++	if (fd_table[server_fd].pconn.uses ==1 && fs->peer)
  	    peerConnectSucceded(fs->peer);
- 	fwdDispatch(fwdState);
-@@ -700,6 +701,8 @@ fwdCheckDeferRead(int fd, void *data)
+ #if USE_SSL
+ 	if ((fs->peer && fs->peer->use_ssl) ||
+@@ -941,6 +942,8 @@ fwdCheckDeferRead(int fd, void *data)
  void
  fwdFail(FwdState * fwdState, ErrorState * errorState)
  {
@@ -2658,7 +2672,7 @@ diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.16
      debug(17, 3) ("fwdFail: %s \"%s\"\n\t%s\n",
  	err_type_str[errorState->type],
  	httpStatusString(errorState->http_status),
-@@ -738,6 +741,8 @@ fwdPeerClosed(int fd, void *data)
+@@ -979,6 +982,8 @@ fwdPeerClosed(int fd, void *data)
  void
  fwdUnregister(int fd, FwdState * fwdState)
  {
@@ -2667,7 +2681,7 @@ diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.16
      debug(17, 3) ("fwdUnregister: %s\n", storeUrl(fwdState->entry));
      assert(fd == fwdState->server_fd);
      assert(fd > -1);
-@@ -754,7 +759,10 @@ fwdUnregister(int fd, FwdState * fwdStat
+@@ -998,7 +1003,10 @@ fwdUnregister(int fd, FwdState * fwdStat
  void
  fwdComplete(FwdState * fwdState)
  {
@@ -2680,31 +2694,26 @@ diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.16
      debug(17, 3) ("fwdComplete: %s\n\tstatus %d\n", storeUrl(e),
  	e->mem_obj->reply->sline.status);
 Index: src/globals.h
-===================================================================
-RCS file: /cvsroot/squid/squid/src/globals.h,v
-retrieving revision 1.14.6.7
-retrieving revision 1.14.6.3.2.5
-diff -p -u -b -r1.14.6.7 -r1.14.6.3.2.5
---- src/globals.h	14 Jun 2005 02:15:00 -0000	1.14.6.7
-+++ src/globals.h	12 Sep 2005 18:34:41 -0000	1.14.6.3.2.5
-@@ -165,6 +165,9 @@ extern char *WIN32_OS_string;	/* NULL */
+--- src/globals.h.orig	Fri Jan 19 01:19:26 2007
++++ src/globals.h	Wed Jan 24 17:15:33 2007
+@@ -171,6 +171,9 @@ extern const char *external_acl_message;
  #if HAVE_SBRK
  extern void *sbrk_start;	/* 0 */
  #endif
 +#if HS_FEAT_ICAP
-+extern char *icap_service_type_str[];
++extern const char *icap_service_type_str[];
 +#endif
  extern int opt_send_signal;	/* -1 */
  extern int opt_no_daemon;	/* 0 */
- 
+ #if LINUX_TPROXY
 Index: src/http.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/http.c,v
-retrieving revision 1.17.6.32
-retrieving revision 1.17.6.3.6.40
-diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
---- src/http.c	19 Oct 2005 02:13:21 -0000	1.17.6.32
-+++ src/http.c	17 Feb 2006 12:45:21 -0000	1.17.6.3.6.40
+retrieving revision 1.49
+retrieving revision 1.28.4.11
+diff -p -u -b -r1.49 -r1.28.4.11
+--- src/http.c	23 Oct 2006 21:53:15 -0000	1.49
++++ src/http.c	3 Nov 2006 18:47:13 -0000	1.28.4.11
 @@ -47,7 +47,7 @@ static CWCB httpSendRequestEntry;
  
  static PF httpReadReply;
@@ -2714,9 +2723,9 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  static PF httpTimeout;
  static void httpCacheNegatively(StoreEntry *);
  static void httpMakePrivate(StoreEntry *);
-@@ -55,11 +55,12 @@ static void httpMakePublic(StoreEntry *)
- static int httpCachableReply(HttpStateData *);
+@@ -56,11 +56,12 @@ static int httpCachableReply(HttpStateDa
  static void httpMaybeRemovePublic(StoreEntry *, http_status);
+ static int peer_supports_connection_pinning(HttpStateData * httpState);
  
 -static void
 +void
@@ -2728,7 +2737,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
      delayClearNoDelay(fd);
  #endif
      if (httpState == NULL)
-@@ -79,6 +80,9 @@ httpStateFree(int fd, void *data)
+@@ -80,6 +81,9 @@ httpStateFree(int fd, void *data)
      requestUnlink(httpState->orig_request);
      httpState->request = NULL;
      httpState->orig_request = NULL;
@@ -2738,7 +2747,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
      cbdataFree(httpState);
  }
  
-@@ -392,7 +396,7 @@ httpMakeVaryMark(request_t * request, Ht
+@@ -409,7 +413,7 @@ httpMakeVaryMark(request_t * request, Ht
  }
  
  /* rewrite this later using new interfaces @?@ */
@@ -2747,7 +2756,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  httpProcessReplyHeader(HttpStateData * httpState, const char *buf, int size)
  {
      StoreEntry *entry = httpState->entry;
-@@ -527,24 +531,35 @@ httpPconnTransferDone(HttpStateData * ht
+@@ -552,24 +556,35 @@ httpPconnTransferDone(HttpStateData * ht
      MemObject *mem = httpState->entry->mem_obj;
      HttpReply *reply = mem->reply;
      squid_off_t clen;
@@ -2786,7 +2795,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	return 0;
      /* We got it all */
      return 1;
-@@ -568,6 +583,17 @@ httpReadReply(int fd, void *data)
+@@ -636,6 +651,17 @@ httpReadReply(int fd, void *data)
      delay_id delay_id;
  #endif
  
@@ -2804,11 +2813,10 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
      if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
  	comm_close(fd);
  	return;
-@@ -579,6 +605,37 @@ httpReadReply(int fd, void *data)
+@@ -647,7 +673,35 @@ httpReadReply(int fd, void *data)
      else
  	delay_id = delayMostBytesAllowed(entry->mem_obj, &read_sz);
  #endif
-+
 +#if HS_FEAT_ICAP
 +    if (httpState->icap_writer) {
 +	IcapStateData *icap = httpState->icap_writer;
@@ -2832,17 +2840,16 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
 +	    commSetSelect(fd, COMM_SELECT_READ, httpReadReply, httpState, 0);
 +	    return;
 +	}
-+
+ 
 +       if(icap->flags.no_content == 1) {
 +	 commSetDefer(fd, fwdCheckDeferRead, icap->respmod.entry);
 +       }
 +    }
 +#endif
-+
      errno = 0;
      statCounter.syscalls.sock.reads++;
      len = FD_READ_METHOD(fd, buf, read_sz);
-@@ -595,7 +652,13 @@ httpReadReply(int fd, void *data)
+@@ -664,7 +718,13 @@ httpReadReply(int fd, void *data)
  	    clen >>= 1;
  	IOStats.Http.read_hist[bin]++;
      }
@@ -2857,7 +2864,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	/* Skip whitespace */
  	while (len > 0 && xisspace(*buf))
  	    xmemmove(buf, buf + 1, len--);
-@@ -625,6 +688,12 @@ httpReadReply(int fd, void *data)
+@@ -694,6 +754,12 @@ httpReadReply(int fd, void *data)
      } else if (len == 0) {
  	/* Connection closed; retrieval done. */
  	httpState->eof = 1;
@@ -2870,7 +2877,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	if (httpState->reply_hdr_state < 2)
  	    /*
  	     * Yes Henrik, there is a point to doing this.  When we
-@@ -677,7 +746,28 @@ httpReadReply(int fd, void *data)
+@@ -746,7 +812,28 @@ httpReadReply(int fd, void *data)
  		    EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
  	    }
  	}
@@ -2899,9 +2906,9 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
  	    /*
  	     * the above storeAppend() call could ABORT this entry,
-@@ -724,10 +814,21 @@ httpReadReply(int fd, void *data)
+@@ -793,10 +880,21 @@ httpReadReply(int fd, void *data)
  			    ("httpReadReply: Excess data from \"%s %s\"\n",
- 			    RequestMethodStr[httpState->orig_request->method],
+ 			    RequestMethodStr[orig_request->method],
  			    storeUrl(entry));
 +#ifdef HS_FEAT_ICAP
 +			if (httpState->icap_writer) {
@@ -2919,11 +2926,11 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
 +		    icapSendRespMod(httpState->icap_writer, NULL, 0, 1);
 +#endif
  		if (keep_alive) {
- 		    /* yes we have to clear all these! */
- 		    commSetDefer(fd, NULL, NULL);
-@@ -766,6 +867,10 @@ httpReadReply(int fd, void *data)
+ 		    int pinned = 0;
+ #if LINUX_TPROXY
+@@ -852,6 +950,10 @@ httpReadReply(int fd, void *data)
  		("httpReadReply: Excess data from \"%s %s\"\n",
- 		RequestMethodStr[httpState->orig_request->method],
+ 		RequestMethodStr[orig_request->method],
  		storeUrl(entry));
 +#ifdef HS_FEAT_ICAP
 +	    if (httpState->icap_writer)
@@ -2932,7 +2939,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	    fwdComplete(httpState->fwd);
  	    comm_close(fd);
  	    return;
-@@ -776,6 +881,34 @@ httpReadReply(int fd, void *data)
+@@ -862,6 +964,34 @@ httpReadReply(int fd, void *data)
      }
  }
  
@@ -2967,7 +2974,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  /* This will be called when request write is complete. Schedule read of
   * reply. */
  static void
-@@ -803,6 +936,63 @@ httpSendComplete(int fd, char *bufnotuse
+@@ -889,6 +1019,63 @@ httpSendComplete(int fd, char *bufnotuse
  	comm_close(fd);
  	return;
      } else {
@@ -2981,7 +2988,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
 +		/* TODO: send error here and exit */
 +		ErrorState *err;
 +		httpState->icap_writer = 0;
-+		err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
++		err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, httpState->fwd->request);
 +		err->xerrno = errno;
 +		err->request = requestLink(httpState->orig_request);
 +		errorAppendEntry(entry, err);
@@ -2998,8 +3005,8 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
 +		 * the icap server, rather than put it into
 +		 * a StoreEntry
 +		 */
++		storeClientUnregisterAbort(httpState->entry);
 +		storeUnlockObject(httpState->entry);
-+		storeUnregisterAbort(httpState->entry);
 +		/*
 +		 * create a bogus entry because the code assumes one is
 +		 * always there.
@@ -3031,7 +3038,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	/*
  	 * Set the read timeout here because it hasn't been set yet.
  	 * We only set the read timeout after the request has been
-@@ -811,8 +1001,18 @@ httpSendComplete(int fd, char *bufnotuse
+@@ -897,8 +1084,18 @@ httpSendComplete(int fd, char *bufnotuse
  	 * the timeout for POST/PUT requests that have very large
  	 * request bodies.
  	 */
@@ -3051,7 +3058,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
      }
      httpState->flags.request_sent = 1;
  }
-@@ -1010,8 +1210,11 @@ httpBuildRequestHeader(request_t * reque
+@@ -1192,8 +1389,11 @@ httpBuildRequestHeader(request_t * reque
  	if (!EBIT_TEST(cc->mask, CC_MAX_AGE)) {
  	    const char *url = entry ? storeUrl(entry) : urlCanonical(orig_request);
  	    httpHdrCcSetMaxAge(cc, getMaxAge(url));
@@ -3063,7 +3070,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
  	}
  	/* Set no-cache if determined needed but not found */
  	if (orig_request->flags.nocache && !httpHeaderHas(hdr_in, HDR_PRAGMA))
-@@ -1119,6 +1322,7 @@ httpStart(FwdState * fwd)
+@@ -1319,6 +1519,7 @@ httpStart(FwdState * fwd)
      int fd = fwd->server_fd;
      HttpStateData *httpState;
      request_t *proxy_req;
@@ -3071,7 +3078,7 @@ diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
      request_t *orig_req = fwd->request;
      debug(11, 3) ("httpStart: \"%s %s\"\n",
  	RequestMethodStr[orig_req->method],
-@@ -1156,12 +1360,22 @@ httpStart(FwdState * fwd)
+@@ -1361,12 +1562,22 @@ httpStart(FwdState * fwd)
  	httpState->request = requestLink(orig_req);
  	httpState->orig_request = requestLink(orig_req);
      }
@@ -3099,8 +3106,8 @@ Index: src/icap_common.c
 RCS file: src/icap_common.c
 diff -N src/icap_common.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_common.c	16 Feb 2006 17:21:45 -0000	1.1.2.40
-@@ -0,0 +1,817 @@
++++ src/icap_common.c	26 May 2006 19:24:02 -0000	1.1.14.3
+@@ -0,0 +1,815 @@
 +/*
 + * $Id$
 + *
@@ -3307,7 +3314,7 @@ diff -N src/icap_common.c
 +{
 +    int rc;
 +    icap->icap_fd = pconnPop(icap->current_service->hostname,
-+	icap->current_service->port);
++	icap->current_service->port, NULL, NULL, 0);
 +    if (icap->icap_fd >= 0) {
 +	debug(81, 3) ("icapConnect: reused pconn FD %d\n", icap->icap_fd);
 +	fd_note(icap->icap_fd, icap->current_service->uri);
@@ -3893,37 +3900,35 @@ diff -N src/icap_common.c
 + *  Builds and adds the X-Server-IP header to an ICAP request headers.
 + */
 +void
-+icapAddOriginIP(MemBuf *mb, const char *host)
++icapAddOriginIP(MemBuf * mb, const char *host)
 +{
-+  const ipcache_addrs *addrs;
-+  struct in_addr s;
++    const ipcache_addrs *addrs;
++    struct in_addr s;
 +
-+  if (host == NULL) {
-+    debug(81, 5)("icapAddOriginIP: NULL host\n");
-+    return;
-+  }
-+    
-+  addrs = ipcache_gethostbyname(host, IP_LOOKUP_IF_MISS);
-+  if (addrs == NULL) {
-+    /*
-+     * http://www.i-cap.org/spec/draft-stecher-icap-subid-00.txt :
-+     *
-+     * [...] If the meta information for some header is not available,
-+     * the header field MUST be omitted.
-+     */
-+    debug(81, 5)("icapAddOriginIP: can't tell IP address\n");
-+    return;
-+  }
-+
-+  s = addrs->in_addrs[0];
-+  memBufPrintf(mb, "X-Server-IP: %s\r\n", inet_ntoa(s));
++    if (host == NULL) {
++	debug(81, 5) ("icapAddOriginIP: NULL host\n");
++	return;
++    }
++    addrs = ipcache_gethostbyname(host, IP_LOOKUP_IF_MISS);
++    if (addrs == NULL) {
++	/*
++	 * http://www.i-cap.org/spec/draft-stecher-icap-subid-00.txt :
++	 *
++	 * [...] If the meta information for some header is not available,
++	 * the header field MUST be omitted.
++	 */
++	debug(81, 5) ("icapAddOriginIP: can't tell IP address\n");
++	return;
++    }
++    s = addrs->in_addrs[0];
++    memBufPrintf(mb, "X-Server-IP: %s\r\n", inet_ntoa(s));
 +}
 Index: src/icap_opt.c
 ===================================================================
 RCS file: src/icap_opt.c
 diff -N src/icap_opt.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_opt.c	16 Feb 2006 17:21:45 -0000	1.1.2.18
++++ src/icap_opt.c	17 May 2006 17:58:01 -0000	1.1.16.1
 @@ -0,0 +1,523 @@
 +
 +/*
@@ -4453,8 +4458,8 @@ Index: src/icap_reqmod.c
 RCS file: src/icap_reqmod.c
 diff -N src/icap_reqmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_reqmod.c	17 Feb 2006 12:50:52 -0000	1.1.2.60
-@@ -0,0 +1,981 @@
++++ src/icap_reqmod.c	12 Dec 2006 22:49:46 -0000	1.1.14.9
+@@ -0,0 +1,990 @@
 +
 +/*
 + * $Id$
@@ -4500,6 +4505,7 @@ diff -N src/icap_reqmod.c
 +
 +PF clientReadRequest;
 +PF connStateFree;
++StoreEntry *clientCreateStoreEntry(clientHttpRequest *, method_t, request_flags);
 +int clientReadDefer(int fd, void *data);
 +int clientCheckContentLength(request_t * r);
 +void clientProcessRequest(clientHttpRequest *);
@@ -4566,6 +4572,8 @@ diff -N src/icap_reqmod.c
 +    http->request = requestLink(request ? request : icap->request);
 +    http->flags.did_icap_reqmod = 1;
 +    http->start = icap->reqmod.start;
++    if (request)
++	http->http_ver = request->http_ver;
 +#if ICAP_PROXY_KEEP_ALIVE
 +    /*
 +     * Here it is possible becouse we are using as client_cookie the original http->conn
@@ -4580,22 +4588,24 @@ diff -N src/icap_reqmod.c
 +    assert(http->conn->chr->next == NULL);
 +    {
 +	ConnStateData *dummyconn;
++        clientHttpRequest *H;
 +	dummyconn = cbdataAlloc(ConnStateData);
 +	dummyconn->fd = icap->reqmod.client_fd;
-+	dummyconn->chr = http->conn->chr;
-+	dummyconn->chr->conn = dummyconn;
++	dummyconn->pinning.fd = -1;
++        H=DLINK_HEAD(conn->reqs);
++        dlinkAddTail(H, &H->node, &dummyconn->reqs);
++        H->conn = dummyconn;
 +	comm_add_close_handler(dummyconn->fd, connStateFree, dummyconn);
 +    }
-+
 +    http->conn->chr = http;
-+
 +#else
 +    http->conn = cbdataAlloc(ConnStateData);
 +    http->conn->fd = icap->reqmod.client_fd;
++    http->conn->pinning.fd = -1;
 +    http->conn->in.size = 0;
 +    http->conn->in.buf = NULL;
 +    http->conn->log_addr = icap->reqmod.log_addr;
-+    http->conn->chr = http;
++    dlinkAddTail(http, &http->node, &http->conn->reqs); 
 +    comm_add_close_handler(http->conn->fd, connStateFree, http->conn);
 +#endif
 +    http->icap_reqmod = NULL;
@@ -4624,8 +4634,7 @@ diff -N src/icap_reqmod.c
 +    if (!urlCheckRequest(request) ||
 +	httpHeaderHas(&request->header, HDR_TRANSFER_ENCODING)) {
 +	ErrorState *err;
-+	err = errorCon(ERR_UNSUP_REQ, HTTP_NOT_IMPLEMENTED);
-+	err->request = requestLink(request);
++	err = errorCon(ERR_UNSUP_REQ, HTTP_NOT_IMPLEMENTED, request);
 +	request->flags.proxy_keepalive = 0;
 +	http->entry =
 +	    clientCreateStoreEntry(http, request->method, null_request_flags);
@@ -4634,8 +4643,7 @@ diff -N src/icap_reqmod.c
 +    }
 +    if (!clientCheckContentLength(request)) {
 +	ErrorState *err;
-+	err = errorCon(ERR_INVALID_REQ, HTTP_LENGTH_REQUIRED);
-+	err->request = requestLink(request);
++	err = errorCon(ERR_INVALID_REQ, HTTP_LENGTH_REQUIRED, request);
 +	http->entry =
 +	    clientCreateStoreEntry(http, request->method, null_request_flags);
 +	errorAppendEntry(http->entry, err);
@@ -4684,9 +4692,8 @@ diff -N src/icap_reqmod.c
 +	return;
 +    http->entry = clientCreateStoreEntry(http,
 +	icap->request->method, null_request_flags);
-+    err = errorCon(et, hs);
++    err = errorCon(et, hs, icap->request);
 +    err->xerrno = xerrno;
-+    err->request = requestLink(icap->request);
 +    errorAppendEntry(http->entry, err);
 +}
 +
@@ -4790,14 +4797,23 @@ diff -N src/icap_reqmod.c
 +	("icapReqModParseHttpRequest: successfully parsed the HTTP request\n");
 +    request->http_ver = http_ver;
 +    request->client_addr = icap->request->client_addr;
++    request->client_port = icap->request->client_port;
 +    request->my_addr = icap->request->my_addr;
 +    request->my_port = icap->request->my_port;
 +    request->class = icap->request->class;
-+    if (icap->request->auth_user_request != NULL) {
++    if (icap->request->auth_user_request) {
 +	/* Copy authentification info in new request */
 +	request->auth_user_request = icap->request->auth_user_request;
 +	authenticateAuthUserRequestLock(request->auth_user_request);
 +    }
++    request->content_length = httpHeaderGetSize(&request->header,
++	HDR_CONTENT_LENGTH);
++    if (strBuf(icap->request->extacl_log))
++	request->extacl_log = stringDup(&icap->request->extacl_log);
++    if (icap->request->extacl_user)
++	request->extacl_user = xstrdup(icap->request->extacl_user);
++    if (icap->request->extacl_passwd)
++	request->extacl_passwd = xstrdup(icap->request->extacl_passwd);
 +#if ICAP_PROXY_KEEP_ALIVE
 +    /*
 +     * Copy the proxy_keepalive flag from the original request
@@ -4834,7 +4850,6 @@ diff -N src/icap_reqmod.c
 +    if (NULL == http)
 +	return;
 +    assert(icap->request);
-+
 +    http->entry = clientCreateStoreEntry(http,
 +	icap->request->method, icap->request->flags);
 +    icap->respmod.entry = http->entry;
@@ -4891,7 +4906,7 @@ diff -N src/icap_reqmod.c
 +    commSetTimeout(fd, -1, NULL, NULL);
 +    commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0);
 +    comm_remove_close_handler(fd, icapStateFree, icap);
-+    pconnPush(fd, icap->current_service->hostname, icap->current_service->port);
++    pconnPush(fd, icap->current_service->hostname, icap->current_service->port, NULL, NULL, 0);
 +    icap->icap_fd = -1;
 +    icapStateFree(-1, icap);
 +}
@@ -5159,7 +5174,7 @@ diff -N src/icap_reqmod.c
 +	memBufPrintf(&mb, "X-Client-IP: %s\r\n", client_addr);
 +
 +    if (service->flags.need_x_server_ip && Config.icapcfg.send_server_ip)
-+        icapAddOriginIP(&mb, icap->request->host);
++	icapAddOriginIP(&mb, icap->request->host);
 +
 +    if ((service->flags.need_x_authenticated_user
 +	    && Config.icapcfg.send_auth_user)
@@ -5187,7 +5202,7 @@ diff -N src/icap_reqmod.c
 + * structure and request a TCP connection to the server.
 + */
 +IcapStateData *
-+icapReqModStart(icap_service *service, const char *uri, request_t * request,
++icapReqModStart(icap_service * service, const char *uri, request_t * request,
 +    int fd, struct timeval start, struct in_addr log_addr, void *cookie)
 +{
 +    IcapStateData *icap = NULL;
@@ -5325,7 +5340,7 @@ diff -N src/icap_reqmod.c
 +	    icapParseChunkedBody(icap,
 +	    icapReqModMemBufAppend, &icap->reqmod.http_entity.buf);
 +    }
-+    if (icap->reqmod.http_entity.bytes_read >= icap->request->content_length)
++    if (icap->chunk_size < 0 )
 +	icap->flags.reqmod_http_entity_eof = 1;
 +
 +    if (!icap->flags.reqmod_http_entity_eof)
@@ -5337,7 +5352,7 @@ diff -N src/icap_reqmod.c
 +	icap->reqmod.http_entity.callback);
 +    debug(81, 3) ("%s:%d http_entity.buf.size=%d\n", __FILE__, __LINE__,
 +	icap->reqmod.http_entity.buf.size);
-+    if (icap->reqmod.http_entity.callback && icap->reqmod.http_entity.buf.size) {
++    if (icap->reqmod.http_entity.callback) {
 +	icapReqModPassHttpBody(icap,
 +	    icap->reqmod.http_entity.callback_buf,
 +	    icap->reqmod.http_entity.callback_bufsize,
@@ -5345,7 +5360,6 @@ diff -N src/icap_reqmod.c
 +	    icap->reqmod.http_entity.callback_data);
 +	icap->reqmod.http_entity.callback = NULL;
 +	cbdataUnlock(icap->reqmod.http_entity.callback_data);
-+
 +    }
 +}
 +
@@ -5441,8 +5455,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
-@@ -0,0 +1,1055 @@
++++ src/icap_respmod.c	26 Sep 2006 22:47:36 -0000	1.1.14.7
+@@ -0,0 +1,1058 @@
 +
 +/*
 + * $Id$
@@ -5484,6 +5498,7 @@ diff -N src/icap_respmod.c
 +static PF icapRespModGobble;
 +extern PF icapReadReply;
 +static PF icapRespModReadReply;
++static void icapRespModKeepAliveOrClose(IcapStateData * icap);
 +static int icapReadReply2(IcapStateData * icap);
 +static void icapReadReply3(IcapStateData * icap);
 +
@@ -5508,9 +5523,8 @@ diff -N src/icap_respmod.c
 +    if (service->flags.need_x_client_ip && Config.icapcfg.send_client_ip) {
 +	memBufPrintf(mb, "X-Client-IP: %s\r\n", client_addr);
 +    }
-+
 +    if (service->flags.need_x_server_ip && Config.icapcfg.send_server_ip)
-+        icapAddOriginIP(mb, icap->request->host);
++	icapAddOriginIP(mb, icap->request->host);
 +
 +    if ((service->flags.need_x_authenticated_user
 +	    && Config.icapcfg.send_auth_user)
@@ -5552,7 +5566,7 @@ diff -N src/icap_respmod.c
 +	o2 = -1;
 +	memBufDefInit(&mb_hdr);
 +	httpBuildRequestPrefix(icap->request, icap->request,
-+			       icap->respmod.entry, &mb_hdr, icap->http_flags);
++	    icap->respmod.entry, &mb_hdr, icap->http_flags);
 +	o3 = mb_hdr.size;
 +    } else {
 +
@@ -5583,9 +5597,9 @@ diff -N src/icap_respmod.c
 +	    icap->respmod.entry, &mb_hdr, icap->http_flags);
 +	o2 = mb_hdr.size;
 +
-+    	/* Copy response header - Append to request header mbuffer */
++	/* Copy response header - Append to request header mbuffer */
 +	memBufAppend(&mb_hdr,
-+		     icap->respmod.req_hdr_copy.buf, icap->respmod.req_hdr_copy.size);
++	    icap->respmod.req_hdr_copy.buf, icap->respmod.req_hdr_copy.size);
 +	o3 = mb_hdr.size;
 +    }
 +
@@ -5702,16 +5716,14 @@ diff -N src/icap_respmod.c
 +#endif
 +
 +    if (icap->sc == 0) {
-+        // http connection has been closed without sending us anything
-+        if(len == 0 && theEnd == 1) {
++	// http connection has been closed without sending us anything
++	if (len == 0 && theEnd == 1) {
 +	    ErrorState *err;
-+	    err = errorCon(ERR_INVALID_RESP, HTTP_BAD_GATEWAY);
-+	    err->request = requestLink(icap->request);
++	    err = errorCon(ERR_INVALID_RESP, HTTP_BAD_GATEWAY, icap->request);
 +	    errorAppendEntry(icap->respmod.entry, err);
 +	    comm_close(icap->icap_fd);
 +	    return;
-+        }
-+
++	}
 +	/* No data sent yet. Start with headers */
 +	if ((icap->sc = buildRespModHeader(&mb, icap, buf, len, theEnd)) > 0) {
 +	    buf += icap->sc;
@@ -5872,8 +5884,7 @@ diff -N src/icap_respmod.c
 +    if (x < 0) {
 +	/* Did not find a proper ICAP response */
 +	debug(81, 3) ("ICAP : Error path!\n");
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-+	err->request = requestLink(icap->request);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
 +	err->xerrno = errno;
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
@@ -5897,8 +5908,7 @@ diff -N src/icap_respmod.c
 +		&version_major, &version_minor, &str_status)) < 0) {
 +	debug(81, 1) ("BAD ICAP status line <%s>\n", icap->icap_hdr.buf);
 +	/* is this correct in case of ICAP protocol error? */
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-+	err->request = requestLink(icap->request);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
 +	err->xerrno = errno;
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
@@ -5945,6 +5955,8 @@ diff -N src/icap_respmod.c
 +#if SUPPORT_ICAP_204 || ICAP_PREVIEW
 +    if (204 == status) {
 +	debug(81, 3) ("got 204 status from ICAP server\n");
++	icapRespModKeepAliveOrClose(icap);
++
 +	debug(81, 3) ("setting icap->flags.no_content\n");
 +	icap->flags.no_content = 1;
 +	/*
@@ -5956,7 +5968,8 @@ diff -N src/icap_respmod.c
 +	    icap->respmod.resp_copy.buf, icap->respmod.resp_copy.size);
 +	icap->respmod.resp_copy.size = 0;
 +	if (icapReadReply2(icap) < 0)
-+	    comm_close(fd);
++	    icapStateFree(-1, icap);
++
 +	/*
 +	 * XXX ideally want to clean icap->respmod.resp_copy here
 +	 * XXX ideally want to "close" ICAP server connection here
@@ -5970,8 +5983,7 @@ diff -N src/icap_respmod.c
 +    if (200 != status && 201 != status) {
 +	debug(81, 1) ("Unsupported status '%d' from ICAP server\n", status);
 +	/* Did not find a proper ICAP response */
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-+	err->request = requestLink(icap->request);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
 +	err->xerrno = errno;
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
@@ -5998,8 +6010,7 @@ diff -N src/icap_respmod.c
 +    if (!directResponse) {
 +	/* Did not find a proper ICAP response */
 +	debug(81, 3) ("ICAP : Error path!\n");
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-+	err->request = requestLink(icap->request);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
 +	err->xerrno = errno;
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
@@ -6057,10 +6068,11 @@ diff -N src/icap_respmod.c
 +    if (errflag == COMM_ERR_CLOSING)
 +	return;
 +    if (errflag) {
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
++	if (cbdataValid(icap)) 
++	    err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
++	else
++	    err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, NULL);
 +	err->xerrno = errno;
-+	if (cbdataValid(icap))
-+	    err->request = requestLink(icap->request);
 +	storeEntryReset(icap->respmod.entry);
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
@@ -6111,9 +6123,8 @@ diff -N src/icap_respmod.c
 +    debug(81, 3) ("icapConnectOver: FD %d, status=%d\n", fd, status);
 +    icap->flags.connect_pending = 0;
 +    if (status < 0) {
-+	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
++	err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, icap->request);
 +	err->xerrno = errno;
-+	err->request = requestLink(icap->request);
 +	errorAppendEntry(icap->respmod.entry, err);
 +	comm_close(fd);
 +	debug(81, 3) ("icapConnectOver: status < 0, unreachable=1\n");
@@ -6251,21 +6262,21 @@ diff -N src/icap_respmod.c
 +    int fd = icap->icap_fd;
 +    if (fd < 0)
 +	return;
-+    if (!icap->flags.keep_alive) {
-+	debug(81, 3) ("%s:%d keep_alive not set, closing\n", __FILE__,
-+	    __LINE__);
-+	comm_close(fd);
-+	return;
-+    }
 +    debug(81, 3) ("%s:%d FD %d looks good, keeping alive\n", __FILE__, __LINE__,
 +	fd);
 +    commSetDefer(fd, NULL, NULL);
 +    commSetTimeout(fd, -1, NULL, NULL);
 +    commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0);
 +    comm_remove_close_handler(fd, icapStateFree, icap);
-+    pconnPush(fd, icap->current_service->hostname, icap->current_service->port);
 +    icap->icap_fd = -1;
-+    icapStateFree(-1, icap);
++    if (!icap->flags.keep_alive) {
++	debug(81, 3) ("%s:%d keep_alive not set, closing\n", __FILE__,
++	    __LINE__);
++	comm_close(fd);
++	return;
++    } else {
++	pconnPush(fd, icap->current_service->hostname, icap->current_service->port, NULL, NULL, 0);
++    }
 +}
 +
 +
@@ -6365,8 +6376,7 @@ diff -N src/icap_respmod.c
 +	} else if (entry->mem_obj->inmem_hi == 0) {
 +	    ErrorState *err;
 +	    debug(81, 2) ("icapReadReply: FD %d: generating error page\n", fd);
-+	    err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-+	    err->request = requestLink((request_t *) request);
++	    err = errorCon(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, (request_t *)request);
 +	    err->xerrno = errno;
 +	    errorAppendEntry(entry, err);
 +	    comm_close(fd);
@@ -6389,9 +6399,8 @@ diff -N src/icap_respmod.c
 +    debug(81, 3) ("icapReadReply2\n");
 +    if (icap->chunk_buf.size == 0 && entry->mem_obj->inmem_hi == 0) {
 +	ErrorState *err;
-+	err = errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_SERVICE_UNAVAILABLE);
++	err = errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_SERVICE_UNAVAILABLE, (request_t *)request);
 +	err->xerrno = errno;
-+	err->request = requestLink((request_t *) request);
 +	errorAppendEntry(entry, err);
 +	icap->flags.http_server_eof = 1;
 +	return -1;
@@ -6484,10 +6493,18 @@ diff -N src/icap_respmod.c
 +    debug(81, 3) ("icapReadReply3\n");
 +    if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 +	debug(81, 3) ("icapReadReply3: Entry Aborded\n");
-+	comm_close(fd);
++	if (icap->flags.no_content)
++	    icapStateFree(-1, icap);
++	else
++	    comm_close(fd);
 +    } else if (icapPconnTransferDone(fd, icap)) {
 +	storeComplete(entry);
-+	icapRespModKeepAliveOrClose(icap);
++	if (icap->flags.no_content)
++	    icapStateFree(-1, icap);
++	else {
++	    icapRespModKeepAliveOrClose(icap);
++	    icapStateFree(-1, icap);
++	}
 +    } else if (!icap->flags.no_content) {
 +	/* Wait for EOF condition */
 +	commSetSelect(fd, COMM_SELECT_READ, icapReadReply, icap, 0);
@@ -6501,12 +6518,12 @@ diff -N src/icap_respmod.c
 Index: src/main.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/main.c,v
-retrieving revision 1.28.6.25
-retrieving revision 1.28.6.8.2.11
-diff -p -u -b -r1.28.6.25 -r1.28.6.8.2.11
---- src/main.c	28 Jun 2005 02:16:51 -0000	1.28.6.25
-+++ src/main.c	12 Sep 2005 18:34:41 -0000	1.28.6.8.2.11
-@@ -350,6 +350,9 @@ mainReconfigure(void)
+retrieving revision 1.72
+retrieving revision 1.45.4.10
+diff -p -u -b -r1.72 -r1.45.4.10
+--- src/main.c	23 Oct 2006 11:52:55 -0000	1.72
++++ src/main.c	3 Nov 2006 18:47:14 -0000	1.45.4.10
+@@ -391,6 +391,9 @@ mainReconfigure(void)
  #else
      idnsShutdown();
  #endif
@@ -6514,22 +6531,22 @@ diff -p -u -b -r1.28.6.25 -r1.28.6.8.2.11
 +    icapClose();
 +#endif
      redirectShutdown();
+     locationRewriteShutdown();
      authenticateShutdown();
-     externalAclShutdown();
-@@ -378,6 +381,9 @@ mainReconfigure(void)
-     idnsInit();
+@@ -422,6 +425,9 @@ mainReconfigure(void)
  #endif
      redirectInit();
+     locationRewriteInit();
 +#ifdef HS_FEAT_ICAP
 +    icapInit();
 +#endif
      authenticateInit(&Config.authConfig);
      externalAclInit();
  #if USE_WCCP
-@@ -507,6 +513,9 @@ mainInitialize(void)
-     idnsInit();
- #endif
+@@ -573,6 +579,9 @@ mainInitialize(void)
      redirectInit();
+     locationRewriteInit();
+     errorMapInit();
 +#ifdef HS_FEAT_ICAP
 +    icapInit();
 +#endif
@@ -6539,13 +6556,13 @@ diff -p -u -b -r1.28.6.25 -r1.28.6.8.2.11
 Index: src/mem.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/mem.c,v
-retrieving revision 1.13
-retrieving revision 1.13.28.2
-diff -p -u -b -r1.13 -r1.13.28.2
---- src/mem.c	7 Sep 2001 23:55:49 -0000	1.13
-+++ src/mem.c	27 Jun 2003 01:15:18 -0000	1.13.28.2
-@@ -243,6 +243,13 @@ memInit(void)
-     memDataInit(MEM_CLIENT_REQ_BUF, "clientRequestBuffer", CLIENT_REQ_BUF_SZ, 0);
+retrieving revision 1.27
+retrieving revision 1.24.4.3
+diff -p -u -b -r1.27 -r1.24.4.3
+--- src/mem.c	20 May 2006 22:50:55 -0000	1.27
++++ src/mem.c	26 May 2006 18:21:32 -0000	1.24.4.3
+@@ -353,6 +353,13 @@ memInit(void)
+     memDataInit(MEM_TLV, "storeSwapTLV", sizeof(tlv), 0);
      memDataInit(MEM_SWAP_LOG_DATA, "storeSwapLogData", sizeof(storeSwapLogData), 0);
  
 +#ifdef HS_FEAT_ICAP
@@ -6560,28 +6577,24 @@ diff -p -u -b -r1.13 -r1.13.28.2
  	StrPools[i].pool = memPoolCreate(StrPoolsAttrs[i].name, StrPoolsAttrs[i].obj_size);
 Index: src/mk-string-arrays.pl
 ===================================================================
-RCS file: /cvsroot/squid/squid/src/mk-string-arrays.pl,v
-retrieving revision 1.2
-retrieving revision 1.2.140.1
-diff -p -u -b -r1.2 -r1.2.140.1
---- src/mk-string-arrays.pl	23 Oct 2000 15:04:21 -0000	1.2
-+++ src/mk-string-arrays.pl	4 Apr 2003 16:55:44 -0000	1.2.140.1
-@@ -16,6 +16,7 @@ $pat{'err_type'} = "err_type_str";
- $pat{'icp_opcode'} = "icp_opcode_str";
+--- src/mk-string-arrays.pl.orig	Fri Jan 19 01:19:26 2007
++++ src/mk-string-arrays.pl	Wed Jan 24 12:31:03 2007
+@@ -17,6 +17,7 @@ $pat{'icp_opcode'} = "icp_opcode_str";
  $pat{'swap_log_op'} = "swap_log_op_str";
  $pat{'lookup_t'} = "lookup_t_str";
+ $pat{'log_type'} = "log_tags";
 +$pat{'icap_service_t'} = "icap_service_type_str";
  
- $state = 0;	# start state
- while (<>) {
+ print "#include \"squid.h\"\n";
+ 
 Index: src/pconn.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/pconn.c,v
-retrieving revision 1.6.38.2
-retrieving revision 1.6.60.2
-diff -p -u -b -r1.6.38.2 -r1.6.60.2
---- src/pconn.c	16 Dec 2003 03:13:59 -0000	1.6.38.2
-+++ src/pconn.c	23 Nov 2005 20:33:07 -0000	1.6.60.2
+retrieving revision 1.10
+retrieving revision 1.9.4.2
+diff -p -u -b -r1.10 -r1.9.4.2
+--- src/pconn.c	22 May 2006 22:06:12 -0000	1.10
++++ src/pconn.c	26 May 2006 18:21:32 -0000	1.9.4.2
 @@ -46,6 +46,9 @@ struct _pconn {
  #define PCONN_HIST_SZ (1<<16)
  int client_pconn_hist[PCONN_HIST_SZ];
@@ -6592,7 +6605,7 @@ diff -p -u -b -r1.6.38.2 -r1.6.60.2
  
  static PF pconnRead;
  static PF pconnTimeout;
-@@ -159,6 +162,20 @@ pconnHistDump(StoreEntry * e)
+@@ -169,6 +172,20 @@ pconnHistDump(StoreEntry * e)
  	    continue;
  	storeAppendPrintf(e, "\t%4d  %9d\n", i, server_pconn_hist[i]);
      }
@@ -6613,7 +6626,7 @@ diff -p -u -b -r1.6.38.2 -r1.6.60.2
  }
  
  /* ========== PUBLIC FUNCTIONS ============================================ */
-@@ -173,6 +190,9 @@ pconnInit(void)
+@@ -183,6 +200,9 @@ pconnInit(void)
      for (i = 0; i < PCONN_HIST_SZ; i++) {
  	client_pconn_hist[i] = 0;
  	server_pconn_hist[i] = 0;
@@ -6623,7 +6636,7 @@ diff -p -u -b -r1.6.38.2 -r1.6.60.2
      }
      pconn_data_pool = memPoolCreate("pconn_data", sizeof(struct _pconn));
      pconn_fds_pool = memPoolCreate("pconn_fds", PCONN_FDS_SZ * sizeof(int));
-@@ -248,11 +268,15 @@ pconnHistCount(int what, int i)
+@@ -265,11 +285,15 @@ pconnHistCount(int what, int i)
  {
      if (i >= PCONN_HIST_SZ)
  	i = PCONN_HIST_SZ - 1;
@@ -6643,12 +6656,12 @@ diff -p -u -b -r1.6.38.2 -r1.6.60.2
 Index: src/protos.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/protos.h,v
-retrieving revision 1.41.6.34
-retrieving revision 1.41.6.13.2.39
-diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.39
---- src/protos.h	26 Feb 2006 03:13:57 -0000	1.41.6.34
-+++ src/protos.h	16 May 2006 17:56:59 -0000	1.41.6.13.2.39
-@@ -292,6 +292,8 @@ extern void whoisStart(FwdState *);
+retrieving revision 1.129
+retrieving revision 1.74.4.11
+diff -p -u -b -r1.129 -r1.74.4.11
+--- src/protos.h	23 Oct 2006 11:52:55 -0000	1.129
++++ src/protos.h	3 Nov 2006 18:47:14 -0000	1.74.4.11
+@@ -302,6 +302,8 @@ extern void whoisStart(FwdState *);
  /* http.c */
  extern int httpCachable(method_t);
  extern void httpStart(FwdState *);
@@ -6657,7 +6670,7 @@ diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.39
  extern int httpBuildRequestPrefix(request_t * request,
      request_t * orig_request,
      StoreEntry * entry,
-@@ -614,6 +616,7 @@ extern void memBufVPrintf(MemBuf * mb, c
+@@ -624,6 +626,7 @@ extern void memBufVPrintf(MemBuf * mb, c
  extern FREE *memBufFreeFunc(MemBuf * mb);
  /* puts report on MemBuf _module_ usage into mb */
  extern void memBufReport(MemBuf * mb);
@@ -6665,9 +6678,9 @@ diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.39
  
  extern char *mime_get_header(const char *mime, const char *header);
  extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix);
-@@ -1341,4 +1344,53 @@ extern void externalAclShutdown(void);
- extern int externalAclRequiresAuth(void *acl_data);
- extern char *strtokFile(void);
+@@ -1417,4 +1420,53 @@ void storeLocateVaryDone(VaryData * data
+ void storeLocateVary(StoreEntry * e, int offset, const char *vary_data, String accept_encoding, STLVCB * callback, void *cbdata);
+ void storeAddVary(const char *url, const char *log_url, const method_t method, const cache_key * key, const char *etag, const char *vary, const char *vary_headers, const char *accept_encoding);
  
 +#ifdef HS_FEAT_ICAP
 +/*
@@ -6722,11 +6735,11 @@ diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.39
 Index: src/squid.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/squid.h,v
-retrieving revision 1.13.6.9
-retrieving revision 1.13.6.6.2.12
-diff -p -u -b -r1.13.6.9 -r1.13.6.6.2.12
---- src/squid.h	11 Mar 2006 03:16:31 -0000	1.13.6.9
-+++ src/squid.h	16 May 2006 17:56:59 -0000	1.13.6.6.2.12
+retrieving revision 1.36
+retrieving revision 1.24.8.7
+diff -p -u -b -r1.36 -r1.24.8.7
+--- src/squid.h	8 Sep 2006 19:50:59 -0000	1.36
++++ src/squid.h	26 Sep 2006 22:47:38 -0000	1.24.8.7
 @@ -38,6 +38,14 @@
  #include "config.h"
  
@@ -6745,12 +6758,12 @@ diff -p -u -b -r1.13.6.9 -r1.13.6.6.2.12
 Index: src/stat.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/stat.c,v
-retrieving revision 1.13.6.14
-retrieving revision 1.13.6.7.2.7
-diff -p -u -b -r1.13.6.14 -r1.13.6.7.2.7
---- src/stat.c	30 Mar 2005 02:17:46 -0000	1.13.6.14
-+++ src/stat.c	23 Nov 2005 20:33:07 -0000	1.13.6.7.2.7
-@@ -775,6 +775,17 @@ statAvgDump(StoreEntry * sentry, int min
+retrieving revision 1.38
+retrieving revision 1.26.8.10
+diff -p -u -b -r1.38 -r1.26.8.10
+--- src/stat.c	1 Nov 2006 21:51:29 -0000	1.38
++++ src/stat.c	3 Nov 2006 18:47:14 -0000	1.26.8.10
+@@ -804,6 +804,17 @@ statAvgDump(StoreEntry * sentry, int min
      storeAppendPrintf(sentry, "server.other.kbytes_out = %f/sec\n",
  	XAVG(server.other.kbytes_out.kb));
  
@@ -6768,7 +6781,7 @@ diff -p -u -b -r1.13.6.14 -r1.13.6.7.2.7
      storeAppendPrintf(sentry, "icp.pkts_sent = %f/sec\n",
  	XAVG(icp.pkts_sent));
      storeAppendPrintf(sentry, "icp.pkts_recv = %f/sec\n",
-@@ -1160,6 +1171,17 @@ statCountersDump(StoreEntry * sentry)
+@@ -1188,6 +1199,17 @@ statCountersDump(StoreEntry * sentry)
      storeAppendPrintf(sentry, "server.other.kbytes_out = %d\n",
  	(int) f->server.other.kbytes_out.kb);
  
@@ -6786,7 +6799,7 @@ diff -p -u -b -r1.13.6.14 -r1.13.6.7.2.7
      storeAppendPrintf(sentry, "icp.pkts_sent = %d\n",
  	f->icp.pkts_sent);
      storeAppendPrintf(sentry, "icp.pkts_recv = %d\n",
-@@ -1459,8 +1481,6 @@ statClientRequests(StoreEntry * s)
+@@ -1488,8 +1510,6 @@ statClientRequests(StoreEntry * s)
  	    storeAppendPrintf(s, "\tme: %s:%d\n",
  		inet_ntoa(conn->me.sin_addr),
  		ntohs(conn->me.sin_port));
@@ -6798,16 +6811,17 @@ diff -p -u -b -r1.13.6.14 -r1.13.6.7.2.7
 Index: src/store.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/store.c,v
-retrieving revision 1.16.6.9
-retrieving revision 1.16.6.2.2.8
-diff -p -u -b -r1.16.6.9 -r1.16.6.2.2.8
---- src/store.c	2 Sep 2005 02:13:43 -0000	1.16.6.9
-+++ src/store.c	12 Sep 2005 18:34:41 -0000	1.16.6.2.2.8
-@@ -520,7 +520,16 @@ storeAppend(StoreEntry * e, const char *
+retrieving revision 1.39
+retrieving revision 1.21.10.10
+diff -p -u -b -r1.39 -r1.21.10.10
+--- src/store.c	10 Dec 2006 06:51:20 -0000	1.39
++++ src/store.c	12 Dec 2006 22:49:46 -0000	1.21.10.10
+@@ -1105,8 +1105,17 @@ storeAppend(StoreEntry * e, const char *
      MemObject *mem = e->mem_obj;
      assert(mem != NULL);
      assert(len >= 0);
 -    assert(e->store_status == STORE_PENDING);
+     mem->refresh_timestamp = squid_curtime;
 +    debug(20, 3) ("storeAppend: '%s'\n", storeKeyText(e->hash.key));
 +    if (e->store_status != STORE_PENDING) {
 +	/*
@@ -6824,12 +6838,12 @@ diff -p -u -b -r1.16.6.9 -r1.16.6.2.2.8
 Index: src/structs.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/structs.h,v
-retrieving revision 1.48.2.46
-retrieving revision 1.48.2.9.2.50
-diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
---- src/structs.h	11 Mar 2006 03:16:31 -0000	1.48.2.46
-+++ src/structs.h	16 May 2006 17:56:59 -0000	1.48.2.9.2.50
-@@ -384,6 +384,23 @@ struct _RemovalPolicySettings {
+retrieving revision 1.136
+retrieving revision 1.81.4.12
+diff -p -u -b -r1.136 -r1.81.4.12
+--- src/structs.h	29 Nov 2006 16:52:51 -0000	1.136
++++ src/structs.h	12 Dec 2006 22:49:47 -0000	1.81.4.12
+@@ -423,6 +423,23 @@ struct _RemovalPolicySettings {
      wordlist *args;
  };
  
@@ -6853,30 +6867,29 @@ diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
  struct _SquidConfig {
      struct {
  	squid_off_t maxSize;
-@@ -715,6 +732,9 @@ struct _SquidConfig {
-     char *store_dir_select_algorithm;
-     int sleep_after_fork;	/* microseconds */
-     external_acl *externalAclHelperList;
+@@ -810,6 +827,9 @@ struct _SquidConfig {
+ #endif
+     time_t refresh_stale_window;
+     int umask;
 +#ifdef HS_FEAT_ICAP
 +    IcapConfig icapcfg;
 +#endif
  };
  
  struct _SquidConfig2 {
-@@ -788,7 +808,10 @@ struct _fde {
-     } flags;
+@@ -891,6 +911,10 @@ struct _fde {
+     comm_pending write_pending;
      squid_off_t bytes_read;
      squid_off_t bytes_written;
--    int uses;			/* ie # req's over persistent conn */
 +    struct {
 +	int uses;
 +	int type;
 +    } pconn;
+     int uses;			/* ie # req's over persistent conn */
      struct _fde_disk {
  	DWCB *wrt_handle;
- 	void *wrt_handle_data;
-@@ -983,6 +1006,131 @@ struct _http_state_flags {
-     unsigned int request_sent:1;
+@@ -1095,6 +1119,131 @@ struct _http_state_flags {
+     unsigned int originpeer:1;
  };
  
 +#ifdef HS_FEAT_ICAP
@@ -7007,7 +7020,7 @@ diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
  struct _HttpStateData {
      StoreEntry *entry;
      request_t *request;
-@@ -994,10 +1142,14 @@ struct _HttpStateData {
+@@ -1106,10 +1255,14 @@ struct _HttpStateData {
      int fd;
      http_state_flags flags;
      FwdState *fwd;
@@ -7022,7 +7035,7 @@ diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
  struct _icpUdpData {
      struct sockaddr_in address;
      void *msg;
-@@ -1099,6 +1251,7 @@ struct _clientHttpRequest {
+@@ -1218,6 +1371,7 @@ struct _clientHttpRequest {
  	unsigned int internal:1;
  	unsigned int done_copying:1;
  	unsigned int purging:1;
@@ -7030,35 +7043,27 @@ diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
  	unsigned int hit:1;
      } flags;
      struct {
-@@ -1107,6 +1260,9 @@ struct _clientHttpRequest {
-     } redirect;
-     dlink_node active;
-     squid_off_t maxBodySize;
+@@ -1232,6 +1386,9 @@ struct _clientHttpRequest {
+      * zero.. [ahc]
+      */
+     char readbuf[CLIENT_SOCK_SZ];
 +#if HS_FEAT_ICAP
 +    IcapStateData *icap_reqmod;
 +#endif
  };
  
  struct _ConnStateData {
-@@ -1134,7 +1290,6 @@ struct _ConnStateData {
-     struct sockaddr_in me;
-     struct in_addr log_addr;
-     char rfc931[USER_IDENT_SZ];
--    int nrequests;
-     struct {
- 	int n;
- 	time_t until;
-@@ -1685,6 +1840,9 @@ struct _request_t {
-     char *peer_login;		/* Configured peer login:password */
-     time_t lastmod;		/* Used on refreshes */
-     const char *vary_headers;	/* Used when varying entities are detected. Changes how the store key is calculated */
+@@ -1900,6 +2057,9 @@ struct _request_t {
+     unsigned int done_etag:1;	/* We have done clientProcessETag on this, don't attempt it again */
+     char *urlgroup;		/* urlgroup, returned by redirectors */
+     char *peer_domain;		/* Configured peer forceddomain */
 +#if HS_FEAT_ICAP
 +    icap_class *class;
 +#endif
      BODY_HANDLER *body_reader;
      void *body_reader_data;
- };
-@@ -1790,7 +1948,11 @@ struct _StatCounters {
+     String extacl_log;		/* String to be used for access.log purposes */
+@@ -2007,7 +2167,11 @@ struct _StatCounters {
  	    kb_t kbytes_in;
  	    kb_t kbytes_out;
  	} all , http, ftp, other;
@@ -7074,12 +7079,12 @@ diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50
 Index: src/typedefs.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/typedefs.h,v
-retrieving revision 1.25.6.8
-retrieving revision 1.25.6.1.6.13
-diff -p -u -b -r1.25.6.8 -r1.25.6.1.6.13
---- src/typedefs.h	27 Mar 2005 02:16:17 -0000	1.25.6.8
-+++ src/typedefs.h	28 Mar 2005 18:05:08 -0000	1.25.6.1.6.13
-@@ -131,6 +131,15 @@ typedef struct _HttpHeaderStat HttpHeade
+retrieving revision 1.41
+retrieving revision 1.32.4.8
+diff -p -u -b -r1.41 -r1.32.4.8
+--- src/typedefs.h	2 Sep 2006 14:17:45 -0000	1.41
++++ src/typedefs.h	26 Sep 2006 22:47:39 -0000	1.32.4.8
+@@ -136,6 +136,15 @@ typedef struct _HttpHeaderStat HttpHeade
  typedef struct _HttpBody HttpBody;
  typedef struct _HttpReply HttpReply;
  typedef struct _HttpStateData HttpStateData;
@@ -7098,11 +7103,11 @@ diff -p -u -b -r1.25.6.8 -r1.25.6.1.6.13
 Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
-retrieving revision 1.7.6.7
-retrieving revision 1.7.6.5.2.3
-diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
---- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
-+++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
+retrieving revision 1.17
+retrieving revision 1.14.10.4
+diff -p -u -b -r1.17 -r1.14.10.4
+--- src/url.c	17 Jun 2006 23:51:19 -0000	1.17
++++ src/url.c	28 Jun 2006 21:12:01 -0000	1.14.10.4
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
@@ -7113,7 +7118,7 @@ diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
      "TOTAL"
  };
  
-@@ -221,6 +224,10 @@ urlParseProtocol(const char *s)
+@@ -217,6 +220,10 @@ urlParseProtocol(const char *s)
  	return PROTO_WHOIS;
      if (strcasecmp(s, "internal") == 0)
  	return PROTO_INTERNAL;
@@ -7124,7 +7129,7 @@ diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
      return PROTO_NONE;
  }
  
-@@ -244,6 +251,10 @@ urlDefaultPort(protocol_t p)
+@@ -240,6 +247,10 @@ urlDefaultPort(protocol_t p)
  	return CACHE_HTTP_PORT;
      case PROTO_WHOIS:
  	return 43;
diff --git a/www/squid30/files/patch-src-cf.data.pre b/www/squid30/files/patch-src-cf.data.pre
index ac5b4bd7ef61..98e99812e05a 100644
--- a/www/squid30/files/patch-src-cf.data.pre
+++ b/www/squid30/files/patch-src-cf.data.pre
@@ -1,6 +1,28 @@
---- src/cf.data.pre.orig	Fri Aug 20 16:23:18 2004
-+++ src/cf.data.pre	Fri Aug 20 16:25:23 2004
-@@ -2396,12 +2396,12 @@
+--- src/cf.data.pre.orig	Thu Oct 12 22:48:48 2006
++++ src/cf.data.pre	Wed Nov  8 18:56:47 2006
+@@ -1183,6 +1183,21 @@
+ 
+ 	Note that for coss, max-size must be less than COSS_MEMBUF_SZ
+ 	(hard coded at 1 MB).
++
++	Note for FreeBSD users:
++	COSS -- like aufs -- uses async IO so if you compiled Squid without
++	support for the aufs storage type, COSS will use POSIX AIO.
++	This means that you need to add the line
++
++	options VFS_AIO
++
++	to your kernel configuration in order to use COSS.
++
++	On FreeBSD 5 and higher you can load the aio(4) module and do not
++	necessarily need to recompile your kernel.
++
++	If you compiled Squid with both support for aufs and COSS, COSS
++	will use aufs' routines and does not need special kernel support.
+ DOC_END
+ 
+ NAME: logformat
+@@ -3280,12 +3295,12 @@
  
  NAME: cache_effective_user
  TYPE: string
diff --git a/www/squid30/files/patch-src-ftp.c b/www/squid30/files/patch-src-ftp.c
deleted file mode 100644
index 44f28b75646f..000000000000
--- a/www/squid30/files/patch-src-ftp.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15.
-
---- src/ftp.c.orig	Sun Feb 26 00:34:13 2006
-+++ src/ftp.c	Mon Jan 15 19:46:29 2007
-@@ -441,7 +441,7 @@
- 	    ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
-     } else if (ftpState->typecode == 'D') {
- 	const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
--	storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path));
-+	storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
-     }
-     storeAppendPrintf(e, "<HR noshade size=\"1px\">\n");
-     storeAppendPrintf(e, "<ADDRESS>\n");
-@@ -689,8 +689,8 @@
- 	snprintf(html, 8192, "%s\n", line);
- 	return html;
-     }
--    if (ftpState->flags.dir_slash)
--	snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
-+    if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
-+	snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
-     else
- 	prefix[0] = '\0';
-     /* Handle builtin <dirup> */
diff --git a/www/squid30/files/patch-tools-Makefile.in b/www/squid30/files/patch-tools-Makefile.in
new file mode 100644
index 000000000000..3daee0c17c82
--- /dev/null
+++ b/www/squid30/files/patch-tools-Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig	Sun May 14 18:30:04 2006
++++ tools/Makefile.in	Sun May 14 18:31:02 2006
+@@ -297,7 +297,7 @@
+ EXTRA_DIST = \
+ 	cachemgr.conf
+ 
+-DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
++DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
+ 
+ # Don't automatically uninstall config files
+ #	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
diff --git a/www/squid30/files/pkg-deinstall.in b/www/squid30/files/pkg-deinstall.in
index e96398a3925f..c775ba284cc2 100644
--- a/www/squid30/files/pkg-deinstall.in
+++ b/www/squid30/files/pkg-deinstall.in
@@ -21,12 +21,11 @@ POST-DEINSTALL)
 	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
 	echo "     created by a default installation of this package, run"
 	echo ""
-	echo "     pw userdel -r -n %%SQUID_UID%% -u 100"
-	echo ""
+	echo "     pw userdel -n %%SQUID_UID%% -u 100"
 	if  [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
 		echo ""
-		echo "     To ease updates, the cache and log directories and"
-		echo "     all configuration files modified by you were preserved."
+		echo "     In order to ease updates the cache and log directories"
+		echo "     and all configuration files modified by you were preserved."
 		echo ""
 		echo "     Please remove them manually if you do not want to use"
 	       	echo "     Squid any longer."
diff --git a/www/squid30/files/pkg-install.in b/www/squid30/files/pkg-install.in
index 5fc09b22e0e3..8e87a6c545c8 100644
--- a/www/squid30/files/pkg-install.in
+++ b/www/squid30/files/pkg-install.in
@@ -16,18 +16,11 @@ squid_user="%%SQUID_UID%%"
 squid_group="%%SQUID_GID%%"
 squid_gid=100
 squid_uid=100
-# Try to catch the case where the $squid_user might have been created with an
-# id greater than or equal 3128. The valid exception is "nobody".
-nobody_uid=65534
-nobody_gid=65534
-squid_oldgid=3128
-squid_olduid=3128
-unset wrong_id
 case $2 in
 PRE-INSTALL)
 	echo "===> Pre-installation configuration for ${pkgname}"
 	if ! pw groupshow ${squid_group} -q >/dev/null ; then
-		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		echo "There is no group '${squid_group}' on this system, so I will try to create it (using group id ${squid_gid}):"
 		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
 			echo "Failed to create group \"${squid_group}\"!" >&2
 			echo "Please create it manually." >&2
@@ -37,16 +30,11 @@ PRE-INSTALL)
 		fi
 	else
 		echo "I will use the existing group '${squid_group}':"
-		current_gid=`pw groupshow ${squid_group}|cut -f 3 -d :`
-		if [ ${current_gid} -ge ${squid_oldgid} \
-		    -a ${current_gid} -ne ${nobody_gid} ]; then
-			wrong_id=1
-		fi	
 	fi
 	pw groupshow ${squid_group}
 
 	if ! pw usershow ${squid_user} -q >/dev/null ; then
-		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		echo "There is no account '${squid_user}' on this system, so I will try to create it (using user id ${squid_uid}):"
 		if ! pw useradd -q -n ${squid_user} \
 		    -u ${squid_uid} -g ${squid_group} \
 	  	    -c "Squid caching-proxy pseudo user" \
@@ -60,53 +48,8 @@ PRE-INSTALL)
 		fi
 	else
 		echo "I will use the existing user '${squid_user}':"
-		current_uid=`id -u ${squid_user}`
-		if [ ${current_uid} -ge ${squid_olduid} \
-		    -a ${current_uid} -ne ${nobody_uid} ];
-		then
-			wrong_id=1
-		fi
 	fi
 	pw usershow ${squid_user}
-	if [ "${wrong_id}" ]; then
-		echo ""
-		echo " * NOTICE *"
-		echo ""
-		echo "The Squid pseudo-user's uid and/or gid have been found"
-		echo "to be greater than or equal 3128."
-		echo ""
-		echo "This is not a problem as such, but violates the FreeBSD"
-		echo "ports' principle that a ports must not claim a uid greater"
-		echo "than 999."
-		echo ""
-		echo "Since version 2.5.4_11, the Squid user is thus created"
-		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
-		echo "port used the first unused uid/gid greater than or"
-		echo "equal 3128."
-		echo ""
-		echo "If you want to change the existing Squid user's id, run"
-		echo "'make changeuser' after the installation has completed."
-		echo "If you installed this port via a package, issue the"
-		echo "following commands as root:"
-		echo ""
-		echo "pw userdel -u ${current_uid}"
-		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
-		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
-		echo "    -c \"Squid caching-proxy pseudo user\" \\"
-		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
-		echo "    -h -"
-		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
-		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
-		echo ""
-		echo "In case you have installed third party software for Squid"
-		echo "like squidGuard, you should additionally run:"
-		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
-		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
-		echo ""
-		if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-			sleep 30
-		fi
-	fi
 	for dir in cache logs; do
 	if [ ! -d ${squid_base}/${dir} ]; then
 		echo "Creating ${squid_base}/${dir}..."
diff --git a/www/squid30/files/pkg-message.in b/www/squid30/files/pkg-message.in
index b6b81aa4760c..9e7d814cda25 100644
--- a/www/squid30/files/pkg-message.in
+++ b/www/squid30/files/pkg-message.in
@@ -1,24 +1,31 @@
      o You can find the configuration files for this package in the
        directory %%PREFIX%%/etc/squid.
-     
+
      o A cache directory has been created in %%PREFIX%%/squid/cache.
        Log files will be written to %%PREFIX%%/squid/logs.
-     
+
        Note:
        You must initialize new cache directories before you can start
-       Squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
+       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
        If your cache directories are already initialized (e.g. after an
-       upgrade of Squid) you do not need to initialize them again.
+       upgrade of squid) you do not need to initialize them again.
 
      o The default configuration will deny everyone access to the
        proxy service. Edit the "http_access" directives in
        %%PREFIX%%/etc/squid/squid.conf to suit your needs.
---begin rcng
 
      Please note that the Squid start script is an rc.d style script.
-     This means that Squid will not start automatically at boot time.
+     This means that Squid will not start automatically at boot
+     time unless it is explicitly enabled.
 
      To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
      Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
---end rcng
+
+     Note:
+     If you just updated your Squid installation from 2.5 or earlier,
+     make sure to check your Squid configuration against the 2.6 default
+     configuration file %%PREFIX%%/etc/squid/squid.conf.default.
+
+     Additionally, you should check your configuration by calling
+     'squid -f /path/to/squid.conf -k parse' before starting Squid.
diff --git a/www/squid30/files/squid.sh.in b/www/squid30/files/squid.in
index 7d1414a2c8b0..6b99f2c5e2e6 100644
--- a/www/squid30/files/squid.sh.in
+++ b/www/squid30/files/squid.in
@@ -2,11 +2,10 @@
 #
 # $FreeBSD$
 #
-# --begin rcng
 # PROVIDE: squid
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-# 
+#
 # Note:
 # Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
 # /etc/rc.conf.d/squid to make this script actually do something. There
@@ -14,43 +13,32 @@
 #
 # Please see squid(8), rc.conf(5) and rc(8) for further details.
 #
-# --end rcng
+
+squid_stop() {
+	echo "Stopping ${name}."
+	${command} ${squid_flags} -k shutdown
+	run_rc_command poll
+}
+
+. %%RC_SUBR%%
 
 name=squid
+rcvar=${name}_enable
+
 command=%%PREFIX%%/sbin/squid
-# --begin rcng
 extra_commands=reload
 reload_cmd="${command} ${squid_flags} -k reconfigure"
-# --end rcng
 stop_cmd="squid_stop"
+
+load_rc_config ${name}
+
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
-# --begin rcng
 squid_enable=${squid_enable:-"NO"}
-# --end rcng
 squid_flags=${squid_flags-"-D"}
 squid_user=${squid_user:-%%SQUID_UID%%}
 default_config=%%PREFIX%%/etc/squid/squid.conf
 
-# --begin rcold
-squid_stop() {
-	echo -n " ${name}"
-	${command} -k shutdown
-	while ps -xcU ${squid_user} | grep -q squid; do
-		sleep 2
-	done
-}
-
-# --end rcold
-# --begin rcng
-squid_stop() {
-	echo "Stopping ${name}."
-	${command} ${squid_flags} -k shutdown
-	run_rc_command poll
-}
-
-. %%RC_SUBR%%
-rcvar=`set_rcvar`
-load_rc_config ${name}
+required_dirs=${squid_chdir}
 
 # squid(8) will not start if ${default_config} is not present so try
 # to catch that beforehand via ${required_files} rather than make
@@ -61,28 +49,5 @@ load_rc_config ${name}
 if [ -z "${squid_flags}" ]; then
 	required_files=${default_config}
 fi
-required_dirs=${squid_chdir}
+
 run_rc_command "$1"
-# --end rcng
-# --begin rcold
-case $1 in
-start)
-	if [ -x "${command}" -a \
-		\( -f "${default_config}" -o "${squid_flags}" \) ]; then
-		echo -n " ${name}"
-		(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
-			"${command} ${squid_flags}")
-	fi
-	;;
-stop)
-	if [ -x "${command}" ]; then
-		${stop_cmd}
-	fi
-	;;
-*)
-	echo "usage: ${0##*/} {start|stop}" >&2
-	exit 64
-	;;
-esac
-exit 0
-# --end rcold