diff -ruN squid-2.5.STABLE11-RC1/ChangeLog squid-2.5.STABLE11-RC2/ChangeLog --- squid-2.5.STABLE11-RC1/ChangeLog Sat Sep 10 20:11:00 2005 +++ squid-2.5.STABLE11-RC2/ChangeLog Fri Sep 16 16:10:14 2005 @@ -49,7 +49,17 @@ - [Cosmetic] Incorrect store dir selection debug message on objects larger than 2Gigabyte (Bug #1343) - [Cosmetic] header_id enum misused as an signed integer (Bug #1343) - - [Coemetic] Allow leaving core dumps when started as root (Bug #1335) + - [Cosmetic] Allow leaving core dumps when started as root (Bug #1335) + - [Medium] Clients could bypass delay_pool settings by faking a cache + hit request (Bug #500) + - [Minor] IP-Filter 4.X support (Bug #1378) + - [Medium] Odd results on pipelined CONNECT requests + - [Major] Squid crashing with "FATAL: Incorrect scheme in auth header" + when using NTLM authentication. + - [Cosmetic] Odd results when pipeline_prefetch is combined with NTLM + authentication (bug #1396) + - [Minor] invalid host was processed as IP 255.255.255.255 in dst acl + (Bug #1394) Changes to squid-2.5.STABLE10 (17 May 2005) diff -ruN squid-2.5.STABLE11-RC1/RELEASENOTES.html squid-2.5.STABLE11-RC2/RELEASENOTES.html --- squid-2.5.STABLE11-RC1/RELEASENOTES.html Sat Sep 10 20:23:23 2005 +++ squid-2.5.STABLE11-RC2/RELEASENOTES.html Fri Sep 16 16:11:48 2005 @@ -2,12 +2,12 @@ - Squid 2.5 release notes + Squid 2.5.STABLE11 release notes -

Squid 2.5 release notes

+

Squid 2.5.STABLE11 release notes

-

Squid Developers

$Id: release-2.5.html,v 1.1.2.56 2005/09/11 02:14:50 hno Exp $ +

Squid Developers

$Id: release-2.5.html,v 1.1.2.58 2005/09/16 22:10:14 hno Exp $
This document contains the release notes for version 2.5 of Squid. Squid is a WWW Cache application developed by the National Laboratory @@ -139,6 +139,7 @@
acl req_hdr/resp_hdr

New acl types in 2.5.STABLE7 to match arbitrary HTTP headers, useful to block certain malware/spyware etc.

relaxed_http_parser

New directive in 2.5.STABLE8 to control how strict the HTTP parser should be.

retry_on_error

New directive in 2.5.STABLE9 to aggressive retry requests on errors (was the default in earlier versions)

+
acl dst

No longer matches invalid hosts. Was previously using the IP address "255.255.255.255" on invalid hosts.

@@ -423,6 +424,11 @@
  • Assertion failed StatHist.c:93
  • Assertion failed store_status == STORE_PENDING
  • Clients could bypass delay pools settings by faking a cache hit
    • +
  • Odd results was seen on pipelined CONNECT requests
    • +
  • Squid crashing with "FATAL: Incorrect scheme in auth header" +when using NTLM authentication.
    • +
  • dst acl changed to not match invalid hosts +
  • a number of other minor and cosmetic bugfixes. See the list of squid-2.5.STABLE10 patches and the ChangeLog file for details.
    • diff -ruN squid-2.5.STABLE11-RC1/configure squid-2.5.STABLE11-RC2/configure --- squid-2.5.STABLE11-RC1/configure Sat Sep 10 20:23:12 2005 +++ squid-2.5.STABLE11-RC2/configure Fri Sep 16 16:11:37 2005 @@ -1022,7 +1022,7 @@ # Define the identity of the package. PACKAGE=squid -VERSION=2.5.STABLE11-RC1 +VERSION=2.5.STABLE11-RC2 cat >> confdefs.h <&6 echo "configure:1079: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -4059,6 +4059,7 @@ ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ + ipl.h \ libc.h \ limits.h \ linux/netfilter_ipv4.h \ @@ -4076,6 +4077,7 @@ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ netinet/ip_nat.h \ + netinet/ipl.h \ openssl/err.h \ openssl/md5.h \ openssl/ssl.h \ @@ -4126,17 +4128,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4130: checking for $ac_hdr" >&5 +echo "configure:4132: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4164,12 +4166,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4168: checking for working const" >&5 +echo "configure:4170: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4239,14 +4241,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4243: checking whether byte ordering is bigendian" >&5 +echo "configure:4245: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4257,11 +4259,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4272,7 +4274,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4292,7 +4294,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4330,20 +4332,20 @@ echo $ac_n "checking if ANSI prototypes work""... $ac_c" 1>&6 -echo "configure:4334: checking if ANSI prototypes work" >&5 +echo "configure:4336: checking if ANSI prototypes work" >&5 if eval "test \"`echo '$''{'ac_cv_have_ansi_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ansi_prototypes="yes" else @@ -4365,13 +4367,13 @@ fi echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6 -echo "configure:4369: checking for tm->tm_gmtoff" >&5 +echo "configure:4371: checking for tm->tm_gmtoff" >&5 if eval "test \"`echo '$''{'ac_cv_have_tm_gmoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4380,7 +4382,7 @@ foo.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:4384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_tm_gmoff="yes" else @@ -4402,13 +4404,13 @@ fi echo $ac_n "checking for struct mallinfo""... $ac_c" 1>&6 -echo "configure:4406: checking for struct mallinfo" >&5 +echo "configure:4408: checking for struct mallinfo" >&5 if eval "test \"`echo '$''{'ac_cv_have_struct_mallinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if HAVE_MALLOC_H @@ -4426,7 +4428,7 @@ foo.keepcost = 0; ; return 0; } EOF -if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_mallinfo="yes" else @@ -4448,13 +4450,13 @@ fi echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6 -echo "configure:4452: checking for extended mallinfo" >&5 +echo "configure:4454: checking for extended mallinfo" >&5 if eval "test \"`echo '$''{'ac_cv_have_ext_mallinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4463,7 +4465,7 @@ foo.mxfast = 0; ; return 0; } EOF -if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ext_mallinfo="yes" else @@ -4485,13 +4487,13 @@ fi echo $ac_n "checking for struct rusage""... $ac_c" 1>&6 -echo "configure:4489: checking for struct rusage" >&5 +echo "configure:4491: checking for struct rusage" >&5 if eval "test \"`echo '$''{'ac_cv_have_struct_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_rusage="yes" else @@ -4526,13 +4528,13 @@ fi echo $ac_n "checking for ip->ip_hl""... $ac_c" 1>&6 -echo "configure:4530: checking for ip->ip_hl" >&5 +echo "configure:4532: checking for ip->ip_hl" >&5 if eval "test \"`echo '$''{'ac_cv_have_ip_hl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4551,7 +4553,7 @@ ip.ip_hl= 0; ; return 0; } EOF -if { (eval echo configure:4555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ip_hl="yes" else @@ -4573,7 +4575,7 @@ fi echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4577: checking size of void *" >&5 +echo "configure:4579: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4581,7 +4583,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4592,7 +4594,7 @@ exit(0); } EOF -if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -4612,7 +4614,7 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4616: checking size of short" >&5 +echo "configure:4618: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4620,7 +4622,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4631,7 +4633,7 @@ exit(0); } EOF -if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -4651,7 +4653,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4655: checking size of int" >&5 +echo "configure:4657: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4659,7 +4661,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4670,7 +4672,7 @@ exit(0); } EOF -if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -4690,7 +4692,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4694: checking size of long" >&5 +echo "configure:4696: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4698,7 +4700,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4709,7 +4711,7 @@ exit(0); } EOF -if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -4729,7 +4731,7 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4733: checking size of long long" >&5 +echo "configure:4735: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4737,7 +4739,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4748,7 +4750,7 @@ exit(0); } EOF -if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -4768,7 +4770,7 @@ echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:4772: checking size of __int64" >&5 +echo "configure:4774: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4776,7 +4778,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4802,7 +4804,7 @@ } EOF -if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -4822,7 +4824,7 @@ echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:4826: checking size of int16_t" >&5 +echo "configure:4828: checking size of int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4830,7 +4832,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4856,7 +4858,7 @@ } EOF -if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -4876,7 +4878,7 @@ echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:4880: checking size of uint16_t" >&5 +echo "configure:4882: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4884,7 +4886,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4910,7 +4912,7 @@ } EOF -if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -4930,7 +4932,7 @@ echo $ac_n "checking size of u_int16_t""... $ac_c" 1>&6 -echo "configure:4934: checking size of u_int16_t" >&5 +echo "configure:4936: checking size of u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4938,7 +4940,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4964,7 +4966,7 @@ } EOF -if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int16_t=`cat conftestval` else @@ -4984,7 +4986,7 @@ echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:4988: checking size of int32_t" >&5 +echo "configure:4990: checking size of int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4992,7 +4994,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5018,7 +5020,7 @@ } EOF -if { (eval echo configure:5022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -5038,7 +5040,7 @@ echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:5042: checking size of uint32_t" >&5 +echo "configure:5044: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5046,7 +5048,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5072,7 +5074,7 @@ } EOF -if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -5092,7 +5094,7 @@ echo $ac_n "checking size of u_int32_t""... $ac_c" 1>&6 -echo "configure:5096: checking size of u_int32_t" >&5 +echo "configure:5098: checking size of u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5100,7 +5102,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5126,7 +5128,7 @@ } EOF -if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int32_t=`cat conftestval` else @@ -5146,7 +5148,7 @@ echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:5150: checking size of int64_t" >&5 +echo "configure:5152: checking size of int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5154,7 +5156,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5180,7 +5182,7 @@ } EOF -if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -5200,7 +5202,7 @@ echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:5204: checking size of uint64_t" >&5 +echo "configure:5206: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5208,7 +5210,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5234,7 +5236,7 @@ } EOF -if { (eval echo configure:5238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -5254,7 +5256,7 @@ echo $ac_n "checking size of u_int64_t""... $ac_c" 1>&6 -echo "configure:5258: checking size of u_int64_t" >&5 +echo "configure:5260: checking size of u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5262,7 +5264,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5288,7 +5290,7 @@ } EOF -if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int64_t=`cat conftestval` else @@ -5310,12 +5312,12 @@ if test "x$ac_cv_sizeof_short" = "x2"; then echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:5314: checking for int16_t" >&5 +echo "configure:5316: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5363: checking for int16_t" >&5 +echo "configure:5365: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5413: checking for u_int16_t" >&5 +echo "configure:5415: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5462: checking for u_int16_t" >&5 +echo "configure:5464: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5511: checking for u_int16_t" >&5 +echo "configure:5513: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5561: checking for int32_t" >&5 +echo "configure:5563: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5610: checking for int32_t" >&5 +echo "configure:5612: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5660: checking for u_int32_t" >&5 +echo "configure:5662: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5709: checking for u_int32_t" >&5 +echo "configure:5711: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5758: checking for u_int32_t" >&5 +echo "configure:5760: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5808: checking for int64_t" >&5 +echo "configure:5810: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5857: checking for int64_t" >&5 +echo "configure:5859: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5906: checking for int64_t" >&5 +echo "configure:5908: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5956: checking for u_int64_t" >&5 +echo "configure:5958: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6005: checking for u_int64_t" >&5 +echo "configure:6007: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6054: checking for u_int64_t" >&5 +echo "configure:6056: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6103: checking for int64_t" >&5 +echo "configure:6105: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6153: checking for pid_t" >&5 +echo "configure:6155: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6182,12 +6184,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6186: checking for size_t" >&5 +echo "configure:6188: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6215,12 +6217,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6219: checking for ssize_t" >&5 +echo "configure:6221: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6248,12 +6250,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6252: checking for off_t" >&5 +echo "configure:6254: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6281,12 +6283,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6285: checking for mode_t" >&5 +echo "configure:6287: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6314,12 +6316,12 @@ fi echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 -echo "configure:6318: checking for fd_mask" >&5 +echo "configure:6320: checking for fd_mask" >&5 if eval "test \"`echo '$''{'ac_cv_type_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6348,7 +6350,7 @@ echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:6352: checking size of off_t" >&5 +echo "configure:6354: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6356,7 +6358,7 @@ ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext < @@ -6382,7 +6384,7 @@ } EOF -if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -6402,7 +6404,7 @@ echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:6406: checking size of size_t" >&5 +echo "configure:6408: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6410,7 +6412,7 @@ ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < @@ -6436,7 +6438,7 @@ } EOF -if { (eval echo configure:6440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -6459,19 +6461,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6463: checking for working alloca.h" >&5 +echo "configure:6465: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6492,12 +6494,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6496: checking for alloca" >&5 +echo "configure:6498: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6557,12 +6559,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6561: checking whether alloca needs Cray hooks" >&5 +echo "configure:6563: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6591: checking for $ac_func" >&5 +echo "configure:6593: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6642,7 +6644,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6646: checking stack direction for C alloca" >&5 +echo "configure:6648: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6650,7 +6652,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6693,13 +6695,13 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:6697: checking for socklen_t" >&5 +echo "configure:6699: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6730,13 +6732,13 @@ fi echo $ac_n "checking for mtyp_t""... $ac_c" 1>&6 -echo "configure:6734: checking for mtyp_t" >&5 +echo "configure:6736: checking for mtyp_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mtyp_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6764,7 +6766,7 @@ fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:6768: checking for main in -lnsl" >&5 +echo "configure:6770: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'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 @@ -6772,14 +6774,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6807,7 +6809,7 @@ fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6811: checking for main in -lsocket" >&5 +echo "configure:6813: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'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 @@ -6815,14 +6817,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6851,13 +6853,13 @@ echo $ac_n "checking for unix domain sockets""... $ac_c" 1>&6 -echo "configure:6855: checking for unix domain sockets" >&5 +echo "configure:6857: checking for unix domain sockets" >&5 if eval "test \"`echo '$''{'squid_cv_unixsocket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6872,7 +6874,7 @@ ; return 0; } EOF -if { (eval echo configure:6876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* squid_cv_unixsocket=yes else @@ -6896,7 +6898,7 @@ echo "skipping libmalloc check (--enable-dlmalloc specified)" else echo $ac_n "checking for main in -lgnumalloc""... $ac_c" 1>&6 -echo "configure:6900: checking for main in -lgnumalloc" >&5 +echo "configure:6902: checking for main in -lgnumalloc" >&5 ac_lib_var=`echo gnumalloc'_'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 @@ -6904,14 +6906,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgnumalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6954,7 +6956,7 @@ *) echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6 -echo "configure:6958: checking for main in -lmalloc" >&5 +echo "configure:6960: checking for main in -lmalloc" >&5 ac_lib_var=`echo malloc'_'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 @@ -6962,14 +6964,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7002,7 +7004,7 @@ fi echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:7006: checking for main in -lbsd" >&5 +echo "configure:7008: checking for main in -lbsd" >&5 ac_lib_var=`echo bsd'_'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 @@ -7010,14 +7012,14 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7045,7 +7047,7 @@ fi echo $ac_n "checking for main in -lregex""... $ac_c" 1>&6 -echo "configure:7049: checking for main in -lregex" >&5 +echo "configure:7051: checking for main in -lregex" >&5 ac_lib_var=`echo regex'_'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 @@ -7053,14 +7055,14 @@ ac_save_LIBS="$LIBS" LIBS="-lregex $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7081,7 +7083,7 @@ fi echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:7085: checking for gethostbyname in -lbind" >&5 +echo "configure:7087: checking for gethostbyname in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7089,7 +7091,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7134,7 +7136,7 @@ ;; *) echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:7138: checking for inet_aton in -lresolv" >&5 +echo "configure:7140: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7142,7 +7144,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7169,7 +7171,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6 -echo "configure:7173: checking for inet_aton in -l44bsd" >&5 +echo "configure:7175: checking for inet_aton in -l44bsd" >&5 ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7177,7 +7179,7 @@ ac_save_LIBS="$LIBS" LIBS="-l44bsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7220,7 +7222,7 @@ fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:7224: checking for main in -lresolv" >&5 +echo "configure:7226: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'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 @@ -7228,14 +7230,14 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7266,7 +7268,7 @@ esac fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:7270: checking for main in -lm" >&5 +echo "configure:7272: checking for main in -lm" >&5 ac_lib_var=`echo m'_'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 @@ -7274,14 +7276,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7310,7 +7312,7 @@ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7314: checking for crypt in -lcrypt" >&5 +echo "configure:7316: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7318,7 +7320,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7353,7 +7355,7 @@ if test "$with_dl" = "yes"; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7357: checking for dlopen in -ldl" >&5 +echo "configure:7359: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7361,7 +7363,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7420,7 +7422,7 @@ ;; esac echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:7424: checking for main in -lpthread" >&5 +echo "configure:7426: checking for main in -lpthread" >&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 @@ -7428,14 +7430,14 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7466,7 +7468,7 @@ if test "$with_aio" = "yes"; then echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6 -echo "configure:7470: checking for aio_read in -lrt" >&5 +echo "configure:7472: checking for aio_read in -lrt" >&5 ac_lib_var=`echo rt'_'aio_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7474,7 +7476,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7517,7 +7519,7 @@ case "$host" in *-pc-sco3.2*) echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:7521: checking for strftime in -lintl" >&5 +echo "configure:7523: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7525,7 +7527,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7567,7 +7569,7 @@ esac echo $ac_n "checking for main in -llber""... $ac_c" 1>&6 -echo "configure:7571: checking for main in -llber" >&5 +echo "configure:7573: checking for main in -llber" >&5 ac_lib_var=`echo lber'_'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 @@ -7575,14 +7577,14 @@ ac_save_LIBS="$LIBS" LIBS="-llber $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7770,12 +7772,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7774: checking for $ac_func" >&5 +echo "configure:7776: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7824,7 +7826,7 @@ echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6 -echo "configure:7828: checking if setresuid is implemented" >&5 +echo "configure:7830: checking if setresuid is implemented" >&5 if eval "test \"`echo '$''{'ac_cv_func_setresuid'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7832,7 +7834,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -7845,7 +7847,7 @@ } EOF -if { (eval echo configure:7849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setresuid="yes" else @@ -7890,7 +7892,7 @@ fi echo $ac_n "checking if va_copy is implemented""... $ac_c" 1>&6 -echo "configure:7894: checking if va_copy is implemented" >&5 +echo "configure:7896: checking if va_copy is implemented" >&5 if eval "test \"`echo '$''{'ac_cv_func_va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7898,7 +7900,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -7916,7 +7918,7 @@ } EOF -if { (eval echo configure:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_va_copy="yes" else @@ -7940,7 +7942,7 @@ fi echo $ac_n "checking if __va_copy is implemented""... $ac_c" 1>&6 -echo "configure:7944: checking if __va_copy is implemented" >&5 +echo "configure:7946: checking if __va_copy is implemented" >&5 if eval "test \"`echo '$''{'ac_cv_func___va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7948,7 +7950,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -7966,7 +7968,7 @@ } EOF -if { (eval echo configure:7970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func___va_copy="yes" else @@ -7991,7 +7993,7 @@ if test "$IPF_TRANSPARENT" ; then echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6 -echo "configure:7995: checking if IP-Filter header files are installed" >&5 +echo "configure:7997: checking if IP-Filter header files are installed" >&5 # hold on to your hats... if test "$ac_cv_header_ip_compat_h" = "yes" || test "$ac_cv_header_ip_fil_compat_h" = "yes" || @@ -8041,7 +8043,7 @@ if test "$PF_TRANSPARENT" ; then echo $ac_n "checking if PF header file is installed""... $ac_c" 1>&6 -echo "configure:8045: checking if PF header file is installed" >&5 +echo "configure:8047: checking if PF header file is installed" >&5 # hold on to your hats... if test "$ac_cv_header_net_pfvar_h" = "yes"; then PF_TRANSPARENT="yes" @@ -8066,7 +8068,7 @@ if test "$LINUX_NETFILTER" ; then echo $ac_n "checking if Linux 2.4 kernel header files are installed""... $ac_c" 1>&6 -echo "configure:8070: checking if Linux 2.4 kernel header files are installed" >&5 +echo "configure:8072: checking if Linux 2.4 kernel header files are installed" >&5 # hold on to your hats... if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes"; then LINUX_NETFILTER="yes" @@ -8100,13 +8102,13 @@ esac fi echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6 -echo "configure:8104: checking if GNUregex needs to be compiled" >&5 +echo "configure:8106: checking if GNUregex needs to be compiled" >&5 if test -z "$USE_GNUREGEX"; then if test "$ac_cv_func_regcomp" = "no" || test "$USE_GNUREGEX" = "yes" ; then USE_GNUREGEX="yes" else cat > conftest.$ac_ext < #include @@ -8114,7 +8116,7 @@ regex_t t; regcomp(&t,"",0); ; return 0; } EOF -if { (eval echo configure:8118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* USE_GNUREGEX="no" else @@ -8146,12 +8148,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8150: checking for $ac_func" >&5 +echo "configure:8152: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8202,12 +8204,12 @@ echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6 -echo "configure:8206: checking Default FD_SETSIZE value" >&5 +echo "configure:8208: checking Default FD_SETSIZE value" >&5 if test "$cross_compiling" = yes; then DEFAULT_FD_SETSIZE=256 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then DEFAULT_FD_SETSIZE=`cat conftestval` else @@ -8251,7 +8253,7 @@ echo $ac_n "checking Maximum number of filedescriptors we can open""... $ac_c" 1>&6 -echo "configure:8255: checking Maximum number of filedescriptors we can open" >&5 +echo "configure:8257: checking Maximum number of filedescriptors we can open" >&5 TLDFLAGS="$LDFLAGS" case $host in i386-unknown-freebsd*) @@ -8263,7 +8265,7 @@ SQUID_MAXFD=256 else cat > conftest.$ac_ext < @@ -8323,7 +8325,7 @@ } EOF -if { (eval echo configure:8327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SQUID_MAXFD=`cat conftestval` else @@ -8350,12 +8352,12 @@ LDFLAGS="$TLDFLAGS" echo $ac_n "checking Default UDP send buffer size""... $ac_c" 1>&6 -echo "configure:8354: checking Default UDP send buffer size" >&5 +echo "configure:8356: checking Default UDP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -8376,7 +8378,7 @@ } EOF -if { (eval echo configure:8380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SQUID_UDP_SO_SNDBUF=`cat conftestval` else @@ -8395,12 +8397,12 @@ echo $ac_n "checking Default UDP receive buffer size""... $ac_c" 1>&6 -echo "configure:8399: checking Default UDP receive buffer size" >&5 +echo "configure:8401: checking Default UDP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -8421,7 +8423,7 @@ } EOF -if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SQUID_UDP_SO_RCVBUF=`cat conftestval` else @@ -8440,12 +8442,12 @@ echo $ac_n "checking Default TCP send buffer size""... $ac_c" 1>&6 -echo "configure:8444: checking Default TCP send buffer size" >&5 +echo "configure:8446: checking Default TCP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -8466,7 +8468,7 @@ } EOF -if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SQUID_TCP_SO_SNDBUF=`cat conftestval` else @@ -8489,12 +8491,12 @@ echo $ac_n "checking Default TCP receive buffer size""... $ac_c" 1>&6 -echo "configure:8493: checking Default TCP receive buffer size" >&5 +echo "configure:8495: checking Default TCP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -8515,7 +8517,7 @@ } EOF -if { (eval echo configure:8519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SQUID_TCP_SO_RCVBUF=`cat conftestval` else @@ -8537,19 +8539,19 @@ EOF echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6 -echo "configure:8541: checking if sys_errlist is already defined" >&5 +echo "configure:8543: checking if sys_errlist is already defined" >&5 if eval "test \"`echo '$''{'ac_cv_needs_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *s = sys_errlist; ; return 0; } EOF -if { (eval echo configure:8553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_needs_sys_errlist="no" else @@ -8571,16 +8573,16 @@ fi echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6 -echo "configure:8575: checking for libresolv _dns_ttl_ hack" >&5 +echo "configure:8577: checking for libresolv _dns_ttl_ hack" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -8596,12 +8598,12 @@ rm -f conftest* echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6 -echo "configure:8600: checking if inet_ntoa() actually works" >&5 +echo "configure:8602: checking if inet_ntoa() actually works" >&5 if test "$cross_compiling" = yes; then INET_NTOA_RESULT="broken" else cat > conftest.$ac_ext < @@ -8620,7 +8622,7 @@ } EOF -if { (eval echo configure:8624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then INET_NTOA_RESULT=`cat conftestval` else @@ -8646,9 +8648,9 @@ if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then echo $ac_n "checking for working statvfs() interface""... $ac_c" 1>&6 -echo "configure:8650: checking for working statvfs() interface" >&5 +echo "configure:8652: checking for working statvfs() interface" >&5 cat > conftest.$ac_ext < @@ -8665,7 +8667,7 @@ ; return 0; } EOF -if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_statvfs=yes else @@ -8685,12 +8687,12 @@ fi echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6 -echo "configure:8689: checking for _res.nsaddr_list" >&5 +echo "configure:8691: checking for _res.nsaddr_list" >&5 if eval "test \"`echo '$''{'ac_cv_have_res_nsaddr_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_nsaddr_list="yes" else @@ -8735,12 +8737,12 @@ if test $ac_cv_have_res_nsaddr_list = "no" ; then echo $ac_n "checking for _res.ns_list""... $ac_c" 1>&6 -echo "configure:8739: checking for _res.ns_list" >&5 +echo "configure:8741: checking for _res.ns_list" >&5 if eval "test \"`echo '$''{'ac_cv_have_res_ns_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_ns_list="yes" else diff -ruN squid-2.5.STABLE11-RC1/configure.in squid-2.5.STABLE11-RC2/configure.in --- squid-2.5.STABLE11-RC1/configure.in Sat Sep 10 20:23:12 2005 +++ squid-2.5.STABLE11-RC2/configure.in Fri Sep 16 16:11:37 2005 @@ -3,15 +3,15 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.251.2.97 2005/09/11 02:19:27 hno Exp $ +dnl $Id: configure.in,v 1.251.2.99 2005/09/16 22:00:42 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 2.5.STABLE11-RC1) +AM_INIT_AUTOMAKE(squid, 2.5.STABLE11-RC2) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.251.2.97 $)dnl +AC_REVISION($Revision: 1.251.2.99 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1299,6 +1299,7 @@ ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ + ipl.h \ libc.h \ limits.h \ linux/netfilter_ipv4.h \ @@ -1316,6 +1317,7 @@ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ netinet/ip_nat.h \ + netinet/ipl.h \ openssl/err.h \ openssl/md5.h \ openssl/ssl.h \ diff -ruN squid-2.5.STABLE11-RC1/include/autoconf.h.in squid-2.5.STABLE11-RC2/include/autoconf.h.in --- squid-2.5.STABLE11-RC1/include/autoconf.h.in Sat Sep 10 19:40:02 2005 +++ squid-2.5.STABLE11-RC2/include/autoconf.h.in Mon Sep 12 18:12:34 2005 @@ -659,6 +659,9 @@ /* Define if you have the header file. */ #undef HAVE_IP_NAT_H +/* Define if you have the header file. */ +#undef HAVE_IPL_H + /* Define if you have the header file. */ #undef HAVE_LIBC_H @@ -709,6 +712,9 @@ /* Define if you have the header file. */ #undef HAVE_NETINET_IP_NAT_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IPL_H /* Define if you have the header file. */ #undef HAVE_NETINET_TCP_H diff -ruN squid-2.5.STABLE11-RC1/include/version.h squid-2.5.STABLE11-RC2/include/version.h --- squid-2.5.STABLE11-RC1/include/version.h Sat Sep 10 20:23:12 2005 +++ squid-2.5.STABLE11-RC2/include/version.h Fri Sep 16 16:11:37 2005 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1126405388 +#define SQUID_RELEASE_TIME 1126908693 #endif diff -ruN squid-2.5.STABLE11-RC1/src/HttpRequest.c squid-2.5.STABLE11-RC2/src/HttpRequest.c --- squid-2.5.STABLE11-RC1/src/HttpRequest.c Thu Oct 7 11:01:13 2004 +++ squid-2.5.STABLE11-RC2/src/HttpRequest.c Thu Sep 15 03:53:28 2005 @@ -1,6 +1,6 @@ /* - * $Id: HttpRequest.c,v 1.30.2.2 2004/10/07 17:01:13 hno Exp $ + * $Id: HttpRequest.c,v 1.30.2.3 2005/09/15 09:53:28 hno Exp $ * * DEBUG: section 73 HTTP Request * AUTHOR: Duane Wessels @@ -98,19 +98,8 @@ return httpHeaderParse(&req->header, blk_start, blk_end); } -/* swaps out request using httpRequestPack */ -void -httpRequestSwapOut(const request_t * req, StoreEntry * e) -{ - Packer p; - assert(req && e); - packerToStoreInit(&p, e); - httpRequestPack(req, &p); - packerClean(&p); -} - /* packs request-line and headers, appends terminator */ -void +static void httpRequestPack(const request_t * req, Packer * p) { assert(req && p); @@ -121,6 +110,37 @@ httpHeaderPackInto(&req->header, p); /* trailer */ packerAppend(p, "\r\n", 2); +} + +/* packs debug info, canonical request-line and headers, appends terminator */ +void +httpRequestPackDebug(request_t * req, Packer * p) +{ + assert(req && p); + /* Client info */ + packerPrintf(p, "Client: %s ", inet_ntoa(req->client_addr)); + packerPrintf(p, "http_port: %s:%d", inet_ntoa(req->my_addr), req->my_port); + if (req->auth_user_request && authenticateUserRequestUsername(req->auth_user_request)) + packerPrintf(p, "user: %s", authenticateUserRequestUsername(req->auth_user_request)); + packerPrintf(p, "\n"); + /* pack request-line */ + packerPrintf(p, "%s %s HTTP/%d.%d\r\n", + RequestMethodStr[req->method], urlCanonical(req), req->http_ver.major, req->http_ver.minor); + /* headers */ + httpHeaderPackInto(&req->header, p); + /* trailer */ + packerAppend(p, "\r\n", 2); +} + +/* swaps out request using httpRequestPack */ +void +httpRequestSwapOut(const request_t * req, StoreEntry * e) +{ + Packer p; + assert(req && e); + packerToStoreInit(&p, e); + httpRequestPack(req, &p); + packerClean(&p); } #if UNUSED_CODE diff -ruN squid-2.5.STABLE11-RC1/src/acl.c squid-2.5.STABLE11-RC2/src/acl.c --- squid-2.5.STABLE11-RC1/src/acl.c Sun May 8 19:48:09 2005 +++ squid-2.5.STABLE11-RC2/src/acl.c Fri Sep 16 15:53:57 2005 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.270.2.38 2005/05/09 01:48:09 hno Exp $ + * $Id: acl.c,v 1.270.2.39 2005/09/16 21:53:57 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1619,7 +1619,7 @@ checklist->state[ACL_DST_IP] = ACL_LOOKUP_NEEDED; return 0; } else { - return aclMatchIp(&ae->data, no_addr); + return 0; } /* NOTREACHED */ case ACL_DST_DOMAIN: diff -ruN squid-2.5.STABLE11-RC1/src/auth/ntlm/auth_ntlm.c squid-2.5.STABLE11-RC2/src/auth/ntlm/auth_ntlm.c --- squid-2.5.STABLE11-RC1/src/auth/ntlm/auth_ntlm.c Thu Sep 1 15:58:50 2005 +++ squid-2.5.STABLE11-RC2/src/auth/ntlm/auth_ntlm.c Fri Sep 16 15:45:10 2005 @@ -1,6 +1,6 @@ /* - * $Id: auth_ntlm.c,v 1.17.2.23 2005/09/01 21:58:50 hno Exp $ + * $Id: auth_ntlm.c,v 1.17.2.24 2005/09/16 21:45:10 hno Exp $ * * DEBUG: section 29 NTLM Authenticator * AUTHOR: Robert Collins @@ -191,21 +191,6 @@ } else { debug(28, 0) ("unrecognised ntlm auth scheme parameter '%s'\n", param_str); } - /* - * disable client side request pipelining. There is a race with - * NTLM when the client sends a second request on an NTLM - * connection before the authenticate challenge is sent. With - * this patch, the client may fail to authenticate, but squid's - * state will be preserved. Caveats: this should be a post-parse - * test, but that can wait for the modular parser to be integrated. - */ - if (ntlmConfig->authenticate && Config.onoff.pipeline_prefetch != 0) - Config.onoff.pipeline_prefetch = 0; - - if (ntlmConfig->use_ntlm_negotiate && ntlmConfig->challengeuses > 0) { - debug(28, 1) ("challenge reuses incompatible with use_ntlm_negotiate. Disabling challenge reuse\n"); - ntlmConfig->challengeuses = 0; - } } @@ -241,6 +226,21 @@ { static int ntlminit = 0; if (ntlmConfig->authenticate) { + /* + * disable client side request pipelining. There is a race with + * NTLM when the client sends a second request on an NTLM + * connection before the authenticate challenge is sent. With + * this patch, the client may fail to authenticate, but squid's + * state will be preserved. + */ + if (ntlmConfig->authenticate && Config.onoff.pipeline_prefetch != 0) { + debug(28, 1) ("pipeline prefetching incompatile with NTLM authentication. Disabling pipeline_prefetch\n"); + Config.onoff.pipeline_prefetch = 0; + } + if (ntlmConfig->use_ntlm_negotiate && ntlmConfig->challengeuses > 0) { + debug(28, 1) ("challenge reuses incompatible with use_ntlm_negotiate. Disabling challenge reuse\n"); + ntlmConfig->challengeuses = 0; + } if (!ntlm_helper_state_pool) ntlm_helper_state_pool = memPoolCreate("NTLM Helper State data", sizeof(ntlm_helper_state_t)); if (!ntlm_user_pool) diff -ruN squid-2.5.STABLE11-RC1/src/authenticate.c squid-2.5.STABLE11-RC2/src/authenticate.c --- squid-2.5.STABLE11-RC1/src/authenticate.c Fri Mar 25 19:50:51 2005 +++ squid-2.5.STABLE11-RC2/src/authenticate.c Fri Sep 16 05:09:35 2005 @@ -1,6 +1,6 @@ /* - * $Id: authenticate.c,v 1.36.2.17 2005/03/26 02:50:51 hno Exp $ + * $Id: authenticate.c,v 1.36.2.19 2005/09/16 11:09:35 hno Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -502,6 +502,16 @@ if (*auth_user_request == NULL) { debug(28, 9) ("authenticateAuthenticate: This is a new checklist test on FD:%d\n", conn ? conn->fd : -1); + if (proxy_auth && !request->auth_user_request && conn && conn->auth_user_request) { + int id = authenticateAuthSchemeId(proxy_auth) + 1; + if (!conn->auth_user_request->auth_user || conn->auth_user_request->auth_user->auth_module != id) { + debug(28, 1) ("authenticateAuthenticate: Unexpected change of authentication scheme from '%s' to '%s' (client %s)\n", + authscheme_list[conn->auth_user_request->auth_user->auth_module - 1].typestr, proxy_auth, inet_ntoa(src_addr)); + authenticateAuthUserRequestUnlock(conn->auth_user_request); + conn->auth_user_request = NULL; + conn->auth_type = AUTH_UNKNOWN; + } + } if ((!request->auth_user_request) && (!conn || conn->auth_type == AUTH_UNKNOWN)) { /* beginning of a new request check */ diff -ruN squid-2.5.STABLE11-RC1/src/cf.data.pre squid-2.5.STABLE11-RC2/src/cf.data.pre --- squid-2.5.STABLE11-RC1/src/cf.data.pre Wed Sep 7 13:14:59 2005 +++ squid-2.5.STABLE11-RC2/src/cf.data.pre Tue Sep 13 07:44:35 2005 @@ -1,6 +1,6 @@ # -# $Id: cf.data.pre,v 1.245.2.98 2005/09/07 19:14:59 wessels Exp $ +# $Id: cf.data.pre,v 1.245.2.99 2005/09/13 13:44:35 serassio Exp $ # # # SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -2440,7 +2440,7 @@ LOC: Config.adminEmail DOC_START Email-address of local cache manager who will receive - mail if the cache dies. The default is "webmaster." + mail if the cache dies. The default is "webmaster". DOC_END diff -ruN squid-2.5.STABLE11-RC1/src/client_side.c squid-2.5.STABLE11-RC2/src/client_side.c --- squid-2.5.STABLE11-RC1/src/client_side.c Thu Sep 1 15:58:50 2005 +++ squid-2.5.STABLE11-RC2/src/client_side.c Thu Sep 15 03:53:28 2005 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.561.2.83 2005/09/01 21:58:50 hno Exp $ + * $Id: client_side.c,v 1.561.2.86 2005/09/15 09:53:28 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -55,6 +55,11 @@ #ifdef _SQUID_SOLARIS_ #undef free #endif +#ifdef HAVE_IPL_H +#include +#elif HAVE_NETINET_IPL_H +#include +#endif #if HAVE_IP_FIL_COMPAT_H #include #elif HAVE_NETINET_IP_FIL_COMPAT_H @@ -1036,7 +1041,7 @@ */ if (strListIsSubstr(&s, ThisCache2, ',')) { debugObj(33, 1, "WARNING: Forwarding loop detected for:\n", - request, (ObjPackMethod) & httpRequestPack); + request, (ObjPackMethod) & httpRequestPackDebug); request->flags.loopdetect = 1; } #if FORW_VIA_DB @@ -2181,6 +2186,9 @@ * this request is in progress, maybe doing an ACL or a redirect, * execution will resume after the operation completes. */ + /* if it was a pipelined CONNECT kick it alive here */ + if (http->request->method == METHOD_CONNECT) + clientAccessCheck(http); } else { debug(33, 2) ("clientKeepaliveNextRequest: FD %d Sending next\n", conn->fd); @@ -2604,8 +2612,12 @@ #if IPF_TRANSPARENT struct natlookup natLookup; static int natfd = -1; - static int siocgnatl_cmd = SIOCGNATL & 0xff; int x; +#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027) + struct ipfobj obj; +#else + static int siocgnatl_cmd = SIOCGNATL & 0xff; +#endif #endif #if PF_TRANSPARENT struct pfioc_natlook nl; @@ -2748,6 +2760,13 @@ if (vhost_mode) { #if IPF_TRANSPARENT static time_t last_reported = 0; +#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027) + obj.ipfo_rev = IPFILTER_VERSION; + obj.ipfo_size = sizeof(natLookup); + obj.ipfo_ptr = &natLookup; + obj.ipfo_type = IPFOBJ_NATLOOKUP; + obj.ipfo_offset = 0; +#endif natLookup.nl_inport = http->conn->me.sin_port; natLookup.nl_outport = http->conn->peer.sin_port; natLookup.nl_inip = http->conn->me.sin_addr; @@ -2756,8 +2775,8 @@ if (natfd < 0) { int save_errno; enter_suid(); -#ifdef IPL_NAME - natfd = open(IPL_NAME, O_RDONLY, 0); +#ifdef IPNAT_NAME + natfd = open(IPNAT_NAME, O_RDONLY, 0); #else natfd = open(IPL_NAT, O_RDONLY, 0); #endif @@ -2771,6 +2790,9 @@ last_reported = squid_curtime; } } else { +#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027) + x = ioctl(natfd, SIOCGNATL, &obj); +#else /* * IP-Filter changed the type for SIOCGNATL between * 3.3 and 3.4. It also changed the cmd value for @@ -2784,6 +2806,7 @@ } else { x = ioctl(natfd, SIOCGNATL, &natLookup); } +#endif if (x < 0) { if (errno != ESRCH) { if (squid_curtime - last_reported > 60) { @@ -3193,7 +3216,13 @@ if (request->method == METHOD_CONNECT) { /* Stop reading requests... */ commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); - clientAccessCheck(http); + if (conn->chr == http) + clientAccessCheck(http); + else { + debug(33, 1) ("WARNING: pipelined CONNECT request seen from %s\n", inet_ntoa(http->conn->peer.sin_addr)); + debugObj(33, 1, "Previous request:\n", conn->chr->request, (ObjPackMethod) & httpRequestPackDebug); + debugObj(33, 1, "This request:\n", request, (ObjPackMethod) & httpRequestPackDebug); + } break; } else { clientAccessCheck(http); diff -ruN squid-2.5.STABLE11-RC1/src/internal.c squid-2.5.STABLE11-RC2/src/internal.c --- squid-2.5.STABLE11-RC1/src/internal.c Thu Jan 11 17:37:18 2001 +++ squid-2.5.STABLE11-RC2/src/internal.c Thu Sep 15 03:53:28 2005 @@ -1,6 +1,6 @@ /* - * $Id: internal.c,v 1.23 2001/01/12 00:37:18 wessels Exp $ + * $Id: internal.c,v 1.23.2.1 2005/09/15 09:53:28 hno Exp $ * * DEBUG: section 76 Internal Squid Object handling * AUTHOR: Duane, Alex, Henrik @@ -69,7 +69,7 @@ storeComplete(entry); } else { debugObj(76, 1, "internalStart: unknown request:\n", - request, (ObjPackMethod) & httpRequestPack); + request, (ObjPackMethod) & httpRequestPackDebug); err = errorCon(ERR_INVALID_REQ, HTTP_NOT_FOUND); err->request = requestLink(request); errorAppendEntry(entry, err); diff -ruN squid-2.5.STABLE11-RC1/src/net_db.c squid-2.5.STABLE11-RC2/src/net_db.c --- squid-2.5.STABLE11-RC1/src/net_db.c Thu Jun 30 12:50:56 2005 +++ squid-2.5.STABLE11-RC2/src/net_db.c Fri Sep 16 15:13:18 2005 @@ -1,6 +1,6 @@ /* - * $Id: net_db.c,v 1.158.2.10 2005/06/30 18:50:56 serassio Exp $ + * $Id: net_db.c,v 1.158.2.11 2005/09/16 21:13:18 hno Exp $ * * DEBUG: section 38 Network Measurement Database * AUTHOR: Duane Wessels @@ -571,7 +571,13 @@ size -= hdr_sz; p += hdr_sz; } else { - size = 0; + if (size >= ex->buf_sz) { + debug(38, 3) ("netdbExchangeHandleReply: Too big HTTP header, aborting\n"); + netdbExchangeDone(ex); + return; + } else { + size = 0; + } } } debug(38, 5) ("netdbExchangeHandleReply: start parsing loop, size = %ld\n", diff -ruN squid-2.5.STABLE11-RC1/src/protos.h squid-2.5.STABLE11-RC2/src/protos.h --- squid-2.5.STABLE11-RC1/src/protos.h Sat Sep 10 19:49:54 2005 +++ squid-2.5.STABLE11-RC2/src/protos.h Thu Sep 15 03:53:28 2005 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.420.2.37 2005/09/11 01:49:54 hno Exp $ + * $Id: protos.h,v 1.420.2.38 2005/09/15 09:53:28 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -507,7 +507,7 @@ extern void requestUnlink(request_t *); extern int httpRequestParseHeader(request_t * req, const char *parse_start); extern void httpRequestSwapOut(const request_t * req, StoreEntry * e); -extern void httpRequestPack(const request_t * req, Packer * p); +extern void httpRequestPackDebug(request_t * req, Packer * p); extern int httpRequestPrefixLen(const request_t * req); extern int httpRequestHdrAllowed(const HttpHeaderEntry * e, String * strConnection); extern int httpRequestHdrAllowedByName(http_hdr_type id); diff -ruN squid-2.5.STABLE11-RC1/src/tools.c squid-2.5.STABLE11-RC2/src/tools.c --- squid-2.5.STABLE11-RC1/src/tools.c Sat Sep 10 19:35:14 2005 +++ squid-2.5.STABLE11-RC2/src/tools.c Fri Sep 16 15:13:18 2005 @@ -1,6 +1,6 @@ /* - * $Id: tools.c,v 1.213.2.19 2005/09/11 01:35:14 hno Exp $ + * $Id: tools.c,v 1.213.2.20 2005/09/16 21:13:18 hno Exp $ * * DEBUG: section 21 Misc Functions * AUTHOR: Harvest Derived @@ -564,7 +564,7 @@ #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) /* Set Linux DUMPABLE flag */ if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0) - debug(50, 0) ("ALERT: prctl: %s\n", xstrerror()); + debug(50, 2) ("prctl: %s\n", xstrerror()); #endif } @@ -581,7 +581,7 @@ #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) /* Set Linux DUMPABLE flag */ if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0) - debug(50, 0) ("ALERT: prctl: %s\n", xstrerror()); + debug(50, 2) ("prctl: %s\n", xstrerror()); #endif } @@ -606,7 +606,7 @@ #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) /* Set Linux DUMPABLE flag */ if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0) - debug(50, 0) ("ALERT: prctl: %s\n", xstrerror()); + debug(50, 2) ("prctl: %s\n", xstrerror()); #endif }