ports/105296: [Maintainer] www/squid26: update to 2.6.STABLE5
Thomas-Martin Seck
tmseck at netcologne.de
Wed Nov 8 18:40:41 UTC 2006
>Number: 105296
>Category: ports
>Synopsis: [Maintainer] www/squid26: update to 2.6.STABLE5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 08 18:40:24 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of November 8, 2006.
>Description:
- update to 2.6.STABLE5, including changeset 11086
- correct the setting of configuration options when compiling COSS: only
specify --enable-coss-aio-ops when COSS is not built alongside with aufs;
in this scenario the user needs to supply POSIX AIO support via aio(4)
or the VFS_AIO kernel option; add a note to the storage type section in
squid.conf.default
(thanks to Guido Serassio for explaining this to the maintainer)
- remove a no longer needed configuration option in the WITH_SQUID_AUFS case
- update the ICAP core patchset to CVS as of 2006/11/04 (no changes in
functionality, only in metadata); adapt the ICAP bootstrap patch to the
latest changes in Squid code
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid26) (revision 1036)
+++ Makefile (.../local/squid26) (revision 1036)
@@ -75,7 +75,7 @@
# Enable experimental multicast notification of cachemisses.
PORTNAME= squid
-PORTVERSION= 2.6.4
+PORTVERSION= 2.6.5
CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
@@ -87,7 +87,7 @@
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.STABLE4
+DISTNAME= squid-2.6.STABLE5
DIST_SUBDIR= squid2.6
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
@@ -100,11 +100,7 @@
http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://www1.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets
-PATCHFILES= 11036.patch 11037.patch 11038.patch 11041.patch 11042.patch \
- 11043.patch 11044.patch 11045.patch 11046.patch 11047.patch \
- 11048.patch 11049.patch 11050.patch 11051.patch 11054.patch \
- 11059.patch 11060.patch 11061.patch 11062.patch 11063.patch \
- 11064.patch 11065.patch 11066.patch
+PATCHFILES= 11086.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck at netcologne.de
@@ -248,13 +244,18 @@
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
+.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}"
Index: distinfo
===================================================================
--- distinfo (.../www/squid26) (revision 1036)
+++ distinfo (.../local/squid26) (revision 1036)
@@ -1,72 +1,6 @@
-MD5 (squid2.6/squid-2.6.STABLE4.tar.bz2) = 81ed6ff977dff6d76b0ad2b5390ebf89
-SHA256 (squid2.6/squid-2.6.STABLE4.tar.bz2) = 8dcb1de14a5438daa21f6e2575703184180514c7e1f8f365c31e2afeb2452cde
-SIZE (squid2.6/squid-2.6.STABLE4.tar.bz2) = 1250801
-MD5 (squid2.6/11036.patch) = 46a9b8eeedc43ee5bbac120b5bbbed8b
-SHA256 (squid2.6/11036.patch) = ae9cb861f5e2d2f925e72f57b2dd06eed50711b238372e4e071e330da7ccc921
-SIZE (squid2.6/11036.patch) = 2524
-MD5 (squid2.6/11037.patch) = 63024a60e0339b7fe86ceb697417786c
-SHA256 (squid2.6/11037.patch) = ee65c606e3cf62e6cd22e1ac38991e194bcec8b60b41a087c0c9b5a8bbb2d0f0
-SIZE (squid2.6/11037.patch) = 7917
-MD5 (squid2.6/11038.patch) = 130118643117241c5f9e6d56ef3386d8
-SHA256 (squid2.6/11038.patch) = 07306d4440bc58835311b126e94cb20ea87ad4e32dc51d5acad253cd23f0cefe
-SIZE (squid2.6/11038.patch) = 1023
-MD5 (squid2.6/11041.patch) = 80f54837d774155d673031c603dadd9c
-SHA256 (squid2.6/11041.patch) = 3f4fa7e6763963b2f179b2fe4980495283ea3fbc9599d6061eff729c1138e58b
-SIZE (squid2.6/11041.patch) = 2748
-MD5 (squid2.6/11042.patch) = 13a720062a85fb852f26755fcd2e000e
-SHA256 (squid2.6/11042.patch) = 4ce2983d267479b4a4883c39eff9f469923551b27c79ae3ba7bae341bc9cc709
-SIZE (squid2.6/11042.patch) = 2386
-MD5 (squid2.6/11043.patch) = 1cf71b99612f2400f2a7ac2bdc77307c
-SHA256 (squid2.6/11043.patch) = f87f02c7d278792a32a5b0a6d36b7f5999d495a88300c0c2f8c41b53663cb1ff
-SIZE (squid2.6/11043.patch) = 1024
-MD5 (squid2.6/11044.patch) = 9c5149364eb0fca2e32b42991339e9e4
-SHA256 (squid2.6/11044.patch) = 3d269d2e7a83dad460f2a635bcaf8289403299418b20fc3ce7d9448e8d7c9699
-SIZE (squid2.6/11044.patch) = 7723
-MD5 (squid2.6/11045.patch) = f1096a86559b46026a27f3fbeab3f298
-SHA256 (squid2.6/11045.patch) = ee58105c2360165bb3fee7ce612bc848ef7c73c009323b856d09e61758e1b33e
-SIZE (squid2.6/11045.patch) = 1018
-MD5 (squid2.6/11046.patch) = e312695f250d1697f4fc5795d93bef04
-SHA256 (squid2.6/11046.patch) = 6dfc2a1fc8737e19a18d0251ce4b67f9b14080939fa72b0ce8a809145582fdf6
-SIZE (squid2.6/11046.patch) = 2871
-MD5 (squid2.6/11047.patch) = e9a208cd8076212c2079c339363f5334
-SHA256 (squid2.6/11047.patch) = cc5bc2b19fa9cd523714a0d3d548448d20be1499a5fda5eabbbf5cf70fd24628
-SIZE (squid2.6/11047.patch) = 2159
-MD5 (squid2.6/11048.patch) = 0e11f3d2fb2175380c7cb6e32548fc8c
-SHA256 (squid2.6/11048.patch) = f0f3a6e9234863da7484f43b42db3ebcbd008764b9df78401e186e66722a82d4
-SIZE (squid2.6/11048.patch) = 1470
-MD5 (squid2.6/11049.patch) = 884ff9982257a946f949483cd1893bee
-SHA256 (squid2.6/11049.patch) = 636e5a8ffdd513a285a8bcbd3bb408c1c94e9cb1a5ad40a1fd6cca9dcba123c2
-SIZE (squid2.6/11049.patch) = 1298
-MD5 (squid2.6/11050.patch) = c0bb702488fcd3bc53b9ee59d4f2c194
-SHA256 (squid2.6/11050.patch) = 117a8505c3d12052db2f1645f18ca94b6fe753a2f5b7d1b9a4b9f7e74f5da58d
-SIZE (squid2.6/11050.patch) = 1587
-MD5 (squid2.6/11051.patch) = 513f003626768910a71868dfa470649c
-SHA256 (squid2.6/11051.patch) = 717f4ed48e9b61d33dd4b20a77be5fd9f8520b90a4101a2e68d01e10e5f3388a
-SIZE (squid2.6/11051.patch) = 1402
-MD5 (squid2.6/11054.patch) = 90fb185f6ec832ba4ad37435bc57093e
-SHA256 (squid2.6/11054.patch) = 19e741fe5fe47f2655539e2b4ab2f9f5ce2db61a26fee27200ba31e8ff677c9c
-SIZE (squid2.6/11054.patch) = 959
-MD5 (squid2.6/11059.patch) = e0a920bfd4540148c63f0d58d949a7fc
-SHA256 (squid2.6/11059.patch) = 9ff6d43fc3fb159d8b0299be30e347de9a4c9f366a12c90c4cc790f7f4102ae7
-SIZE (squid2.6/11059.patch) = 62269
-MD5 (squid2.6/11060.patch) = 9500cbed8c98a8539faf2e45c1baa6d6
-SHA256 (squid2.6/11060.patch) = dca55c95e1e5ef01c070bc35b1e942194d1796630cf34ba83fa6e6570cd65816
-SIZE (squid2.6/11060.patch) = 934
-MD5 (squid2.6/11061.patch) = 463a74c0aa760633594de2fa31e2d0ed
-SHA256 (squid2.6/11061.patch) = 7e3663f8e875153eeb38133b8af960e17030c745124da3c0adad7a5f6f9e45b1
-SIZE (squid2.6/11061.patch) = 1882
-MD5 (squid2.6/11062.patch) = 2caf9ef1c79b3c0106c240013633aa73
-SHA256 (squid2.6/11062.patch) = 43af881beffdab8aeada818310dabdcedb65556111561b8e89e331de579ca278
-SIZE (squid2.6/11062.patch) = 1419
-MD5 (squid2.6/11063.patch) = a0bb80c41650e9a9dd7670f4c4e8488f
-SHA256 (squid2.6/11063.patch) = 589d5eb4a3c86cb89928385c13f0bf2da097d07aa4c20423edae3de4ba123416
-SIZE (squid2.6/11063.patch) = 2704
-MD5 (squid2.6/11064.patch) = bf59e2261b52a683f3e70a6303856d76
-SHA256 (squid2.6/11064.patch) = 0d8a5e6d12f1c12b1d260861a74dec46988ed70621a0d7778fb07ecc4fde7e91
-SIZE (squid2.6/11064.patch) = 2787
-MD5 (squid2.6/11065.patch) = 57d832689bad48e4b25127f4cafd94a4
-SHA256 (squid2.6/11065.patch) = a8be8118b7a72f42f5a31d82d97f0d6778fc4a344f21f0bfe9f507961e3bce15
-SIZE (squid2.6/11065.patch) = 3435
-MD5 (squid2.6/11066.patch) = 6e79c84dd70516f0b1da6b74b4a7ea47
-SHA256 (squid2.6/11066.patch) = 5b92d5b5a8d9e73eaf9507223a0f58594fd0111c5993b619c48c493dbe4cd35e
-SIZE (squid2.6/11066.patch) = 1192
+MD5 (squid2.6/squid-2.6.STABLE5.tar.bz2) = b9f2e3b2c9e2c44e0fb729bf8f26d945
+SHA256 (squid2.6/squid-2.6.STABLE5.tar.bz2) = 611af99791d5fd3b681ca59422ccb64f3e67d8f62b068fb0db295edbcdea7245
+SIZE (squid2.6/squid-2.6.STABLE5.tar.bz2) = 1260850
+MD5 (squid2.6/11086.patch) = c274f3afa32bf13b88669fee8086f6a2
+SHA256 (squid2.6/11086.patch) = 9f3c143e8b4eb832247cce0f4ba419027443c1459e6768f6cdc0331c84096170
+SIZE (squid2.6/11086.patch) = 1060
Index: files/patch-src-cf.data.pre
===================================================================
--- files/patch-src-cf.data.pre (.../www/squid26) (revision 1036)
+++ files/patch-src-cf.data.pre (.../local/squid26) (revision 1036)
@@ -1,7 +1,29 @@
---- 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
-DEFAULT: nobody
Index: files/icap-2.6-bootstrap.patch
===================================================================
--- files/icap-2.6-bootstrap.patch (.../www/squid26) (revision 1036)
+++ files/icap-2.6-bootstrap.patch (.../local/squid26) (revision 1036)
@@ -7,16 +7,16 @@
Please see icap-2.6-core.patch for further information.
-Patch last updated: 2006-09-30
+Patch last updated: 2006-11-04
---- configure.orig Sat Aug 5 16:24:35 2006
-+++ configure Sat Aug 5 16:19:46 2006
+--- 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 WI
N32_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 EPOLL_LIBS USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_T
RUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SEL!
ECT_WIN3
2_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 WI
N32_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 EPOLL_LIBS USE_POLL_TR
UE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_!
TRUE USE
_SELECT_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_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 WI
N32_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_EPO
LL_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 WI
N32_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_SE!
LECT_FAL
SE 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.
@@ -28,7 +28,7 @@
--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
-@@ -3843,6 +3844,40 @@
+@@ -3954,6 +3955,40 @@
fi;
@@ -69,7 +69,16 @@
# Check whether --enable-useragent-log or --disable-useragent-log was given.
if test "${enable_useragent_log+set}" = set; then
enableval="$enable_useragent_log"
-@@ -15688,6 +15725,8 @@
+@@ -15923,6 +15958,8 @@
+
+
+
++
++
+ for ac_func in \
+ bcopy \
+ backtrace_symbols_fd \
+@@ -15971,6 +16008,8 @@
srand48 \
srandom \
statfs \
@@ -78,7 +87,7 @@
strsep \
strtoll \
sysconf \
-@@ -16247,6 +16286,52 @@
+@@ -16430,6 +16469,52 @@
if false; then
@@ -131,7 +140,7 @@
NEED_OWN_STRSEP_TRUE=
NEED_OWN_STRSEP_FALSE='#'
else
-@@ -17731,6 +17816,20 @@
+@@ -17947,6 +18032,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -152,7 +161,7 @@
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
-@@ -17878,6 +17977,34 @@
+@@ -18101,6 +18200,34 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -187,7 +196,7 @@
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
-@@ -18536,6 +18663,8 @@
+@@ -18766,6 +18893,8 @@
s, at ENABLE_PINGER_FALSE@,$ENABLE_PINGER_FALSE,;t t
s, at USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t
s, at USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t
@@ -320,35 +329,33 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strsep.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stub_memaccount.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
---- src/Makefile.in.orig Fri Sep 22 11:09:48 2006
-+++ src/Makefile.in Sat Sep 30 20:01:47 2006
-@@ -90,15 +90,16 @@
- forward.c fqdncache.c ftp.c 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 store_digest.c store_dir.c \
-+ HttpMsg.c HttpReply.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 urn.c useragent.c wais.c wccp.c wccp2.c \
-@@ -113,14 +114,17 @@
+-- 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 at am__objects_3 = dns_internal.$(OBJEXT)
@USE_DNSSERVER_TRUE at am__objects_3 = dns.$(OBJEXT)
@ENABLE_HTCP_TRUE at am__objects_4 = htcp.$(OBJEXT)
@@ -373,7 +380,7 @@
am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \
CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
-@@ -135,27 +139,27 @@
+@@ -136,27 +140,27 @@
HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
@@ -433,7 +440,7 @@
USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
USE_POLL_FALSE = @USE_POLL_FALSE@
-@@ -374,6 +384,8 @@
+@@ -376,6 +386,8 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -442,7 +449,7 @@
@USE_DNSSERVER_FALSE at DNSSOURCE = dns_internal.c
@USE_DNSSERVER_TRUE at DNSSOURCE = dns.c
@USE_DNSSERVER_FALSE at DNSSERVER =
-@@ -475,6 +487,7 @@
+@@ -479,6 +491,7 @@
HttpMsg.c \
HttpReply.c \
HttpRequest.c \
@@ -450,7 +457,7 @@
icmp.c \
icp_v2.c \
icp_v3.c \
-@@ -786,6 +799,10 @@
+@@ -791,6 +804,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/helper.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htcp.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http.Po at am__quote@
Index: files/icap-2.6-core.patch
===================================================================
--- files/icap-2.6-core.patch (.../www/squid26) (revision 1036)
+++ files/icap-2.6-core.patch (.../local/squid26) (revision 1036)
@@ -8,7 +8,7 @@
autotools bootstrap. Instead, we simulate said bootstrapping with
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 -rZ-icap-2_6_merge_HEAD -ricap-2_6
@@ -16,9 +16,7 @@
See http://devel.squid-cache.org/icap/ for further information
about the ICAP client project.
-Patch last updated: 2006-10-08; manually tweaked to reflect a change
-from Squid patchset 11044 that was not merged back to the ICAP branch at
-that time.
+Patch last updated: 2006-11-04
Index: errors/Azerbaijani/ERR_ICAP_FAILURE
===================================================================
@@ -1402,12 +1400,12 @@
Index: src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid/squid/src/cache_cf.c,v
-retrieving revision 1.84
-retrieving revision 1.61.4.10
-diff -p -u -b -r1.84 -r1.61.4.10
---- src/cache_cf.c 22 Sep 2006 10:53:20 -0000 1.84
-+++ src/cache_cf.c 26 Sep 2006 22:47:32 -0000 1.61.4.10
-@@ -2380,6 +2380,587 @@ check_null_body_size_t(dlink_list bodyli
+retrieving revision 1.85
+retrieving revision 1.61.4.11
+diff -p -u -b -r1.85 -r1.61.4.11
+--- src/cache_cf.c 30 Sep 2006 21:52:27 -0000 1.85
++++ src/cache_cf.c 3 Nov 2006 18:47:06 -0000 1.61.4.11
+@@ -2385,6 +2385,587 @@ check_null_body_size_t(dlink_list bodyli
return bodylist.head == NULL;
}
@@ -2017,12 +2015,12 @@
Index: src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
-retrieving revision 1.156
-retrieving revision 1.100.4.10
-diff -p -u -b -r1.156 -r1.100.4.10
---- src/cf.data.pre 25 Sep 2006 20:52:28 -0000 1.156
-+++ src/cf.data.pre 26 Sep 2006 22:47:33 -0000 1.100.4.10
-@@ -3187,7 +3187,6 @@ DOC_START
+retrieving revision 1.158
+retrieving revision 1.100.4.11
+diff -p -u -b -r1.158 -r1.100.4.11
+--- src/cf.data.pre 12 Oct 2006 20:51:58 -0000 1.158
++++ src/cf.data.pre 3 Nov 2006 18:47:06 -0000 1.100.4.11
+@@ -3184,7 +3184,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
@@ -2030,7 +2028,7 @@
NAME: reply_header_max_size
COMMENT: (KB)
TYPE: b_size_t
-@@ -3456,6 +3455,187 @@ DOC_START
+@@ -3453,6 +3452,187 @@ DOC_START
DOC_END
COMMENT_START
@@ -2237,11 +2235,11 @@
Index: src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
-retrieving revision 1.146
-retrieving revision 1.89.4.12
-diff -p -u -b -r1.146 -r1.89.4.12
---- src/client_side.c 22 Sep 2006 09:52:57 -0000 1.146
-+++ src/client_side.c 26 Sep 2006 22:47:34 -0000 1.89.4.12
+retrieving revision 1.147
+retrieving revision 1.89.4.13
+diff -p -u -b -r1.147 -r1.89.4.13
+--- src/client_side.c 30 Sep 2006 21:52:27 -0000 1.147
++++ src/client_side.c 3 Nov 2006 18:47:06 -0000 1.89.4.13
@@ -109,7 +109,7 @@ static const char *const crlf = "\r\n";
static CWCB clientWriteComplete;
static CWCB clientWriteBodyComplete;
@@ -2370,7 +2368,7 @@
clientHierarchical(clientHttpRequest * http)
{
const char *url = http->uri;
-@@ -3339,7 +3358,7 @@ clientProcessRequest2(clientHttpRequest
+@@ -3351,7 +3370,7 @@ clientProcessRequest2(clientHttpRequest
return LOG_TCP_HIT;
}
@@ -2391,7 +2389,7 @@
if (r->method == METHOD_CONNECT && !http->redirect.status) {
http->log_type = LOG_TCP_MISS;
#if USE_SSL && SSL_CONNECT_INTERCEPT
-@@ -3806,6 +3830,20 @@ clientReadRequest(int fd, void *data)
+@@ -3828,6 +3852,20 @@ clientReadRequest(int fd, void *data)
(long) conn->in.offset, (long) conn->in.size);
len = conn->in.size - conn->in.offset - 1;
}
@@ -2412,7 +2410,7 @@
statCounter.syscalls.sock.reads++;
size = FD_READ_METHOD(fd, conn->in.buf + conn->in.offset, len);
if (size > 0) {
-@@ -3909,7 +3947,15 @@ clientReadRequest(int fd, void *data)
+@@ -3931,7 +3969,15 @@ clientReadRequest(int fd, void *data)
/* add to the client request queue */
for (H = &conn->chr; *H; H = &(*H)->next);
*H = http;
@@ -2429,7 +2427,7 @@
commSetTimeout(fd, Config.Timeout.lifetime, clientLifetimeTimeout, http);
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);
-@@ -4080,7 +4126,7 @@ clientReadRequest(int fd, void *data)
+@@ -4102,7 +4148,7 @@ clientReadRequest(int fd, void *data)
}
/* file_read like function, for reading body content */
@@ -2438,7 +2436,7 @@
clientReadBody(request_t * request, char *buf, size_t size, CBCB * callback, void *cbdata)
{
ConnStateData *conn = request->body_reader_data;
-@@ -4209,7 +4255,7 @@ clientProcessBody(ConnStateData * conn)
+@@ -4231,7 +4277,7 @@ clientProcessBody(ConnStateData * conn)
}
/* Abort a body request */
@@ -2447,7 +2445,7 @@
clientAbortBody(request_t * request)
{
ConnStateData *conn = request->body_reader_data;
-@@ -4251,7 +4297,7 @@ requestTimeout(int fd, void *data)
+@@ -4273,7 +4319,7 @@ requestTimeout(int fd, void *data)
* Some data has been sent to the client, just close the FD
*/
comm_close(fd);
@@ -2456,7 +2454,7 @@
/*
* assume its a persistent connection; just close it
*/
-@@ -4989,6 +5035,52 @@ varyEvaluateMatch(StoreEntry * entry, re
+@@ -5015,6 +5061,52 @@ varyEvaluateMatch(StoreEntry * entry, re
}
}
@@ -2512,11 +2510,11 @@
Index: src/comm.c
===================================================================
RCS file: /cvsroot/squid/squid/src/comm.c,v
-retrieving revision 1.48
-retrieving revision 1.29.10.8
-diff -p -u -b -r1.48 -r1.29.10.8
---- src/comm.c 9 Sep 2006 12:50:47 -0000 1.48
-+++ src/comm.c 26 Sep 2006 22:47:35 -0000 1.29.10.8
+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);
@@ -2531,11 +2529,11 @@
Index: src/enums.h
===================================================================
RCS file: /cvsroot/squid/squid/src/enums.h,v
-retrieving revision 1.56
-retrieving revision 1.45.4.5
-diff -p -u -b -r1.56 -r1.45.4.5
---- src/enums.h 19 Jul 2006 17:52:44 -0000 1.56
-+++ src/enums.h 22 Jul 2006 14:12:01 -0000 1.45.4.5
+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,
@@ -2554,7 +2552,7 @@
PROTO_MAX
} protocol_t;
-@@ -632,6 +636,12 @@ typedef enum {
+@@ -630,6 +634,12 @@ typedef enum {
#if USE_SSL
MEM_ACL_CERT_DATA,
#endif
@@ -2567,7 +2565,7 @@
MEM_MAX
} mem_type;
-@@ -732,9 +742,14 @@ typedef enum {
+@@ -730,9 +740,14 @@ typedef enum {
CBDATA_RemovalPolicyWalker,
CBDATA_RemovalPurgeWalker,
CBDATA_store_client,
@@ -2582,7 +2580,7 @@
/*
* Return codes from checkVary(request)
*/
-@@ -782,4 +797,68 @@ typedef enum {
+@@ -781,4 +796,68 @@ typedef enum {
ST_OP_CREATE
} store_op_t;
@@ -2654,11 +2652,11 @@
Index: src/forward.c
===================================================================
RCS file: /cvsroot/squid/squid/src/forward.c,v
-retrieving revision 1.41
-retrieving revision 1.20.4.8
-diff -p -u -b -r1.41 -r1.20.4.8
---- src/forward.c 25 Aug 2006 12:53:49 -0000 1.41
-+++ src/forward.c 26 Sep 2006 22:47:35 -0000 1.20.4.8
+retrieving revision 1.42
+retrieving revision 1.20.4.9
+diff -p -u -b -r1.42 -r1.20.4.9
+--- src/forward.c 30 Sep 2006 21:52:28 -0000 1.42
++++ src/forward.c 3 Nov 2006 18:47:13 -0000 1.20.4.9
@@ -358,8 +358,9 @@ fwdConnectDone(int server_fd, int status
} else {
debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry));
@@ -2671,7 +2669,7 @@
peerConnectSucceded(fs->peer);
#if USE_SSL
if ((fs->peer && fs->peer->use_ssl) ||
-@@ -934,6 +935,8 @@ fwdCheckDeferRead(int fd, void *data)
+@@ -935,6 +936,8 @@ fwdCheckDeferRead(int fd, void *data)
void
fwdFail(FwdState * fwdState, ErrorState * errorState)
{
@@ -2680,7 +2678,7 @@
debug(17, 3) ("fwdFail: %s \"%s\"\n\t%s\n",
err_type_str[errorState->type],
httpStatusString(errorState->http_status),
-@@ -972,6 +975,8 @@ fwdPeerClosed(int fd, void *data)
+@@ -973,6 +976,8 @@ fwdPeerClosed(int fd, void *data)
void
fwdUnregister(int fd, FwdState * fwdState)
{
@@ -2689,7 +2687,7 @@
debug(17, 3) ("fwdUnregister: %s\n", storeUrl(fwdState->entry));
assert(fd == fwdState->server_fd);
assert(fd > -1);
-@@ -991,7 +996,10 @@ fwdUnregister(int fd, FwdState * fwdStat
+@@ -992,7 +997,10 @@ fwdUnregister(int fd, FwdState * fwdStat
void
fwdComplete(FwdState * fwdState)
{
@@ -2722,11 +2720,11 @@
Index: src/http.c
===================================================================
RCS file: /cvsroot/squid/squid/src/http.c,v
-retrieving revision 1.48
-retrieving revision 1.28.4.10
-diff -p -u -b -r1.48 -r1.28.4.10
---- src/http.c 25 Aug 2006 12:53:50 -0000 1.48
-+++ src/http.c 26 Sep 2006 22:47:36 -0000 1.28.4.10
+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;
@@ -2769,7 +2767,7 @@
httpProcessReplyHeader(HttpStateData * httpState, const char *buf, int size)
{
StoreEntry *entry = httpState->entry;
-@@ -551,24 +555,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;
@@ -2808,7 +2806,7 @@
return 0;
/* We got it all */
return 1;
-@@ -635,6 +650,17 @@ httpReadReply(int fd, void *data)
+@@ -636,6 +651,17 @@ httpReadReply(int fd, void *data)
delay_id delay_id;
#endif
@@ -2826,7 +2824,7 @@
if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
comm_close(fd);
return;
-@@ -646,7 +672,35 @@ httpReadReply(int fd, void *data)
+@@ -647,7 +673,35 @@ httpReadReply(int fd, void *data)
else
delay_id = delayMostBytesAllowed(entry->mem_obj, &read_sz);
#endif
@@ -2862,7 +2860,7 @@
errno = 0;
statCounter.syscalls.sock.reads++;
len = FD_READ_METHOD(fd, buf, read_sz);
-@@ -663,7 +717,13 @@ httpReadReply(int fd, void *data)
+@@ -664,7 +718,13 @@ httpReadReply(int fd, void *data)
clen >>= 1;
IOStats.Http.read_hist[bin]++;
}
@@ -2877,7 +2875,7 @@
/* Skip whitespace */
while (len > 0 && xisspace(*buf))
xmemmove(buf, buf + 1, len--);
-@@ -693,6 +753,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;
@@ -2890,7 +2888,7 @@
if (httpState->reply_hdr_state < 2)
/*
* Yes Henrik, there is a point to doing this. When we
-@@ -745,7 +811,28 @@ httpReadReply(int fd, void *data)
+@@ -746,7 +812,28 @@ httpReadReply(int fd, void *data)
EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
}
}
@@ -2919,7 +2917,7 @@
if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
/*
* the above storeAppend() call could ABORT this entry,
-@@ -792,10 +879,21 @@ httpReadReply(int fd, void *data)
+@@ -793,10 +880,21 @@ httpReadReply(int fd, void *data)
("httpReadReply: Excess data from \"%s %s\"\n",
RequestMethodStr[orig_request->method],
storeUrl(entry));
@@ -2941,7 +2939,7 @@
if (keep_alive) {
int pinned = 0;
#if LINUX_TPROXY
-@@ -851,6 +949,10 @@ httpReadReply(int fd, void *data)
+@@ -852,6 +950,10 @@ httpReadReply(int fd, void *data)
("httpReadReply: Excess data from \"%s %s\"\n",
RequestMethodStr[orig_request->method],
storeUrl(entry));
@@ -2952,7 +2950,7 @@
fwdComplete(httpState->fwd);
comm_close(fd);
return;
-@@ -861,6 +963,34 @@ httpReadReply(int fd, void *data)
+@@ -862,6 +964,34 @@ httpReadReply(int fd, void *data)
}
}
@@ -2987,7 +2985,7 @@
/* This will be called when request write is complete. Schedule read of
* reply. */
static void
-@@ -888,6 +1018,63 @@ httpSendComplete(int fd, char *bufnotuse
+@@ -889,6 +1019,63 @@ httpSendComplete(int fd, char *bufnotuse
comm_close(fd);
return;
} else {
@@ -3051,7 +3049,7 @@
/*
* Set the read timeout here because it hasn't been set yet.
* We only set the read timeout after the request has been
-@@ -896,8 +1083,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.
*/
@@ -3071,7 +3069,7 @@
}
httpState->flags.request_sent = 1;
}
-@@ -1191,8 +1388,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));
@@ -3083,7 +3081,7 @@
}
/* Set no-cache if determined needed but not found */
if (orig_request->flags.nocache && !httpHeaderHas(hdr_in, HDR_PRAGMA))
-@@ -1318,6 +1518,7 @@ httpStart(FwdState * fwd)
+@@ -1319,6 +1519,7 @@ httpStart(FwdState * fwd)
int fd = fwd->server_fd;
HttpStateData *httpState;
request_t *proxy_req;
@@ -3091,7 +3089,7 @@
request_t *orig_req = fwd->request;
debug(11, 3) ("httpStart: \"%s %s\"\n",
RequestMethodStr[orig_req->method],
-@@ -1360,12 +1561,22 @@ httpStart(FwdState * fwd)
+@@ -1361,12 +1562,22 @@ httpStart(FwdState * fwd)
httpState->request = requestLink(orig_req);
httpState->orig_request = requestLink(orig_req);
}
@@ -6531,11 +6529,11 @@
Index: src/main.c
===================================================================
RCS file: /cvsroot/squid/squid/src/main.c,v
-retrieving revision 1.71
-retrieving revision 1.45.4.9
-diff -p -u -b -r1.71 -r1.45.4.9
---- src/main.c 2 Sep 2006 14:17:45 -0000 1.71
-+++ src/main.c 26 Sep 2006 22:47:37 -0000 1.45.4.9
+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();
@@ -6673,12 +6671,12 @@
Index: src/protos.h
===================================================================
RCS file: /cvsroot/squid/squid/src/protos.h,v
-retrieving revision 1.128
-retrieving revision 1.74.4.10
-diff -p -u -b -r1.128 -r1.74.4.10
---- src/protos.h 22 Sep 2006 10:53:21 -0000 1.128
-+++ src/protos.h 26 Sep 2006 22:47:37 -0000 1.74.4.10
-@@ -300,6 +300,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 *);
@@ -6687,7 +6685,7 @@
extern int httpBuildRequestPrefix(request_t * request,
request_t * orig_request,
StoreEntry * entry,
-@@ -622,6 +624,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);
@@ -6695,7 +6693,7 @@
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);
-@@ -1415,4 +1418,53 @@ void storeLocateVaryDone(VaryData * data
+@@ -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);
@@ -6775,11 +6773,11 @@
Index: src/stat.c
===================================================================
RCS file: /cvsroot/squid/squid/src/stat.c,v
-retrieving revision 1.37
-retrieving revision 1.26.8.9
-diff -p -u -b -r1.37 -r1.26.8.9
---- src/stat.c 18 Sep 2006 23:52:32 -0000 1.37
-+++ src/stat.c 26 Sep 2006 22:47:38 -0000 1.26.8.9
+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));
@@ -6828,12 +6826,12 @@
Index: src/store.c
===================================================================
RCS file: /cvsroot/squid/squid/src/store.c,v
-retrieving revision 1.36
-retrieving revision 1.21.10.8
-diff -p -u -b -r1.36 -r1.21.10.8
---- src/store.c 16 Aug 2006 00:53:06 -0000 1.36
-+++ src/store.c 21 Aug 2006 19:48:11 -0000 1.21.10.8
-@@ -1097,8 +1097,17 @@ storeAppend(StoreEntry * e, const char *
+retrieving revision 1.38
+retrieving revision 1.21.10.9
+diff -p -u -b -r1.38 -r1.21.10.9
+--- src/store.c 9 Oct 2006 13:52:39 -0000 1.38
++++ src/store.c 3 Nov 2006 18:47:14 -0000 1.21.10.9
+@@ -1105,8 +1105,17 @@ storeAppend(StoreEntry * e, const char *
MemObject *mem = e->mem_obj;
assert(mem != NULL);
assert(len >= 0);
@@ -6855,11 +6853,11 @@
Index: src/structs.h
===================================================================
RCS file: /cvsroot/squid/squid/src/structs.h,v
-retrieving revision 1.132
-retrieving revision 1.81.4.10
-diff -p -u -b -r1.132 -r1.81.4.10
---- src/structs.h 21 Sep 2006 04:51:56 -0000 1.132
-+++ src/structs.h 26 Sep 2006 22:47:38 -0000 1.81.4.10
+retrieving revision 1.134
+retrieving revision 1.81.4.11
+diff -p -u -b -r1.134 -r1.81.4.11
+--- src/structs.h 23 Oct 2006 11:52:56 -0000 1.134
++++ src/structs.h 3 Nov 2006 18:47:14 -0000 1.81.4.11
@@ -423,6 +423,23 @@ struct _RemovalPolicySettings {
wordlist *args;
};
@@ -6905,7 +6903,7 @@
int uses; /* ie # req's over persistent conn */
struct _fde_disk {
DWCB *wrt_handle;
-@@ -1092,6 +1116,131 @@ struct _http_state_flags {
+@@ -1095,6 +1119,131 @@ struct _http_state_flags {
unsigned int originpeer:1;
};
@@ -7037,7 +7035,7 @@
struct _HttpStateData {
StoreEntry *entry;
request_t *request;
-@@ -1103,10 +1252,14 @@ struct _HttpStateData {
+@@ -1106,10 +1255,14 @@ struct _HttpStateData {
int fd;
http_state_flags flags;
FwdState *fwd;
@@ -7052,7 +7050,7 @@
struct _icpUdpData {
struct sockaddr_in address;
void *msg;
-@@ -1215,6 +1368,7 @@ struct _clientHttpRequest {
+@@ -1218,6 +1371,7 @@ struct _clientHttpRequest {
unsigned int internal:1;
unsigned int done_copying:1;
unsigned int purging:1;
@@ -7060,7 +7058,7 @@
unsigned int hit:1;
} flags;
struct {
-@@ -1223,6 +1377,9 @@ struct _clientHttpRequest {
+@@ -1226,6 +1380,9 @@ struct _clientHttpRequest {
} redirect;
dlink_node active;
squid_off_t maxBodySize;
@@ -7070,7 +7068,7 @@
};
struct _ConnStateData {
-@@ -1890,6 +2047,9 @@ struct _request_t {
+@@ -1894,6 +2051,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 */
@@ -7080,7 +7078,7 @@
BODY_HANDLER *body_reader;
void *body_reader_data;
String extacl_log; /* String to be used for access.log purposes */
-@@ -1997,7 +2157,11 @@ struct _StatCounters {
+@@ -2001,7 +2161,11 @@ struct _StatCounters {
kb_t kbytes_in;
kb_t kbytes_out;
} all , http, ftp, other;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list