Differences from squid-2.5.STABLE5 to squid-2.5.STABLE5-20040421 Index: squid/ChangeLog diff -u squid/ChangeLog:1.520.2.73 squid/ChangeLog:1.520.2.74 --- squid/ChangeLog:1.520.2.73 Sun Feb 29 15:24:27 2004 +++ squid/ChangeLog Sun Mar 21 13:09:25 2004 @@ -11,7 +11,7 @@ - auth_param documentation clarifications and added default realm values making only the helper program a required attribute - Bug #795: German ERR_DNS_FAIL correction - - Bug #803: Lithuantian error messages update + - Bug #803: Lithuanian error messages update - Bug #806: Segfault if failing to load error page - Bug #812: Mozilla/Netscape plugins mime type defined (.xpi) - Bug #817: maximum_object_size too large causes squid not to cache Index: squid/Makefile.in diff -u squid/Makefile.in:1.6.2.18 squid/Makefile.in:1.6.2.19 --- squid/Makefile.in:1.6.2.18 Tue Feb 11 19:02:00 2003 +++ squid/Makefile.in Sat Mar 6 18:11:26 2004 @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.6.2.18 2003/02/12 02:02:00 hno Exp $ +# $Id: Makefile.in,v 1.6.2.19 2004/03/07 01:11:26 hno Exp $ # SHELL = @SHELL@ @@ -93,6 +93,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/configure diff -u squid/configure:1.248.2.53 squid/configure:1.248.2.56 --- squid/configure:1.248.2.53 Sun Feb 29 15:28:40 2004 +++ squid/configure Mon Apr 5 18:11:29 2004 @@ -52,7 +52,7 @@ for details on how to build your custom store module" ac_help="$ac_help --enable-heap-replacement - Backwards compability option. Please use the + Backwards compatibility option. Please use the new --enable-removal-policies directive instead." ac_help="$ac_help --enable-removal-policies=\"list of policies\" @@ -175,7 +175,7 @@ module" ac_help="$ac_help --enable-auth-modules=\"list of helpers\" - Backwards compability alias for + Backwards compatibility alias for --enable-basic-auth-helpers" ac_help="$ac_help --enable-basic-auth-helpers=\"list of helpers\" @@ -1051,7 +1051,7 @@ -# From configure.in Revision: 1.251.2.51 +# From configure.in Revision: 1.251.2.54 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo "configure:1057: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -1510,13 +1510,50 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1517: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKGCONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKGCONFIG" in + /*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKGCONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKGCONFIG" && ac_cv_path_PKGCONFIG="/usr/bin/false" + ;; +esac +fi +PKGCONFIG="$ac_cv_path_PKGCONFIG" +if test -n "$PKGCONFIG"; then + echo "$ac_t""$PKGCONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1515: checking for Cygwin environment" >&5 +echo "configure:1552: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+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:1568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1544,19 +1581,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1548: checking for mingw32 environment" >&5 +echo "configure:1585: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+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:1597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1575,7 +1612,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1579: checking for executable suffix" >&5 +echo "configure:1616: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1585,7 +1622,7 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; @@ -1606,13 +1643,13 @@ ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1610: checking for object suffix" >&5 +echo "configure:1647: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2365,10 +2402,9 @@ if test -z "$SSLLIB"; then SSLLIB="-lcrypto" # for MD5 routines fi - if test -d /usr/kerberos/include && test -z "$SSLLIBDIR" && test -f /usr/include/openssl/kssl.h; then - echo "OpenSSL depends on Kerberos" - SSLLIBDIR="/usr/kerberos/lib" - CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" + if $PKGCONFIG --exists openssl; then + SSLLIB="`$PKGCONFIG --libs openssl`" + CPPFLAGS="`$PKGCONFIG --cflags openssl` $CPPFLAGS" fi fi if test -n "$SSLLIBDIR"; then @@ -2986,7 +3022,7 @@ esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2990: checking how to run the C preprocessor" >&5 +echo "configure:3026: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3001,13 +3037,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3047: \"$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 : @@ -3018,13 +3054,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3064: \"$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 : @@ -3035,13 +3071,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3081: \"$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 : @@ -3077,7 +3113,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3081: checking for a BSD compatible install" >&5 +echo "configure:3117: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3132,7 +3168,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3136: checking for $ac_word" >&5 +echo "configure:3172: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3160,7 +3196,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3164: checking whether ln -s works" >&5 +echo "configure:3200: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3183,7 +3219,7 @@ # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3187: checking for $ac_word" >&5 +echo "configure:3223: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3219,7 +3255,7 @@ # Extract the first word of "false", so it can be a program name with args. set dummy false; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3223: checking for $ac_word" >&5 +echo "configure:3259: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FALSE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3255,7 +3291,7 @@ # Extract the first word of "true", so it can be a program name with args. set dummy true; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3259: checking for $ac_word" >&5 +echo "configure:3295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TRUE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3291,7 +3327,7 @@ # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3295: checking for $ac_word" >&5 +echo "configure:3331: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3327,7 +3363,7 @@ # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3331: checking for $ac_word" >&5 +echo "configure:3367: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3363,7 +3399,7 @@ # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3367: checking for $ac_word" >&5 +echo "configure:3403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3399,7 +3435,7 @@ # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3403: checking for $ac_word" >&5 +echo "configure:3439: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3435,7 +3471,7 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3439: checking for $ac_word" >&5 +echo "configure:3475: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3471,7 +3507,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3475: checking for $ac_word" >&5 +echo "configure:3511: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3531,12 +3567,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3535: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3571: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3544,7 +3580,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3569,7 +3605,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3573: checking for opendir in -ldir" >&5 +echo "configure:3609: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3577,7 +3613,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3628: \"$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 @@ -3610,7 +3646,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3614: checking for opendir in -lx" >&5 +echo "configure:3650: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3618,7 +3654,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3669: \"$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 @@ -3652,12 +3688,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3656: checking for ANSI C header files" >&5 +echo "configure:3692: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3665,7 +3701,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3705: \"$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* @@ -3682,7 +3718,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3700,7 +3736,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3721,7 +3757,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3732,7 +3768,7 @@ exit (0); } EOF -if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3839,17 +3875,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3843: checking for $ac_hdr" >&5 +echo "configure:3879: 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:3853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3889: \"$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* @@ -3877,12 +3913,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3881: checking for working const" >&5 +echo "configure:3917: 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:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3952,14 +3988,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3956: checking whether byte ordering is bigendian" >&5 +echo "configure:3992: 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 @@ -3970,11 +4006,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4010: \"$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 @@ -3985,7 +4021,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4005,7 +4041,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:4058: \"$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 @@ -4043,20 +4079,20 @@ echo $ac_n "checking if ANSI prototypes work""... $ac_c" 1>&6 -echo "configure:4047: checking if ANSI prototypes work" >&5 +echo "configure:4083: 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:4096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ansi_prototypes="yes" else @@ -4078,13 +4114,13 @@ fi echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6 -echo "configure:4082: checking for tm->tm_gmtoff" >&5 +echo "configure:4118: 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 @@ -4093,7 +4129,7 @@ foo.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:4097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_tm_gmoff="yes" else @@ -4115,13 +4151,13 @@ fi echo $ac_n "checking for struct mallinfo""... $ac_c" 1>&6 -echo "configure:4119: checking for struct mallinfo" >&5 +echo "configure:4155: 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 @@ -4139,7 +4175,7 @@ foo.keepcost = 0; ; return 0; } EOF -if { (eval echo configure:4143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_mallinfo="yes" else @@ -4161,13 +4197,13 @@ fi echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6 -echo "configure:4165: checking for extended mallinfo" >&5 +echo "configure:4201: 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 @@ -4176,7 +4212,7 @@ foo.mxfast = 0; ; return 0; } EOF -if { (eval echo configure:4180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ext_mallinfo="yes" else @@ -4198,13 +4234,13 @@ fi echo $ac_n "checking for struct rusage""... $ac_c" 1>&6 -echo "configure:4202: checking for struct rusage" >&5 +echo "configure:4238: 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:4257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_rusage="yes" else @@ -4239,13 +4275,13 @@ fi echo $ac_n "checking for ip->ip_hl""... $ac_c" 1>&6 -echo "configure:4243: checking for ip->ip_hl" >&5 +echo "configure:4279: 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 @@ -4264,7 +4300,7 @@ ip.ip_hl= 0; ; return 0; } EOF -if { (eval echo configure:4268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ip_hl="yes" else @@ -4286,7 +4322,7 @@ fi echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4290: checking size of void *" >&5 +echo "configure:4326: 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 @@ -4294,7 +4330,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4305,7 +4341,7 @@ exit(0); } EOF -if { (eval echo configure:4309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4345: \"$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 @@ -4325,7 +4361,7 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4329: checking size of short" >&5 +echo "configure:4365: 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 @@ -4333,7 +4369,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4344,7 +4380,7 @@ exit(0); } EOF -if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4384: \"$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 @@ -4364,7 +4400,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4368: checking size of int" >&5 +echo "configure:4404: 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 @@ -4372,7 +4408,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4383,7 +4419,7 @@ exit(0); } EOF -if { (eval echo configure:4387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4423: \"$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 @@ -4403,7 +4439,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4407: checking size of long" >&5 +echo "configure:4443: 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 @@ -4411,7 +4447,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4422,7 +4458,7 @@ exit(0); } EOF -if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4462: \"$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 @@ -4442,7 +4478,7 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4446: checking size of long long" >&5 +echo "configure:4482: 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 @@ -4450,7 +4486,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4461,7 +4497,7 @@ exit(0); } EOF -if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4501: \"$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 @@ -4481,7 +4517,7 @@ echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:4485: checking size of __int64" >&5 +echo "configure:4521: 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 @@ -4489,7 +4525,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4515,7 +4551,7 @@ } EOF -if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4555: \"$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 @@ -4535,7 +4571,7 @@ echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:4539: checking size of int16_t" >&5 +echo "configure:4575: 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 @@ -4543,7 +4579,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4569,7 +4605,7 @@ } EOF -if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4609: \"$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 @@ -4589,7 +4625,7 @@ echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:4593: checking size of uint16_t" >&5 +echo "configure:4629: 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 @@ -4597,7 +4633,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4623,7 +4659,7 @@ } EOF -if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4663: \"$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 @@ -4643,7 +4679,7 @@ echo $ac_n "checking size of u_int16_t""... $ac_c" 1>&6 -echo "configure:4647: checking size of u_int16_t" >&5 +echo "configure:4683: 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 @@ -4651,7 +4687,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4677,7 +4713,7 @@ } EOF -if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4717: \"$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 @@ -4697,7 +4733,7 @@ echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:4701: checking size of int32_t" >&5 +echo "configure:4737: 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 @@ -4705,7 +4741,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4731,7 +4767,7 @@ } EOF -if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4771: \"$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 @@ -4751,7 +4787,7 @@ echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:4755: checking size of uint32_t" >&5 +echo "configure:4791: 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 @@ -4759,7 +4795,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4785,7 +4821,7 @@ } EOF -if { (eval echo configure:4789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4825: \"$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 @@ -4805,7 +4841,7 @@ echo $ac_n "checking size of u_int32_t""... $ac_c" 1>&6 -echo "configure:4809: checking size of u_int32_t" >&5 +echo "configure:4845: 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 @@ -4813,7 +4849,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4839,7 +4875,7 @@ } EOF -if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4879: \"$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 @@ -4859,7 +4895,7 @@ echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:4863: checking size of int64_t" >&5 +echo "configure:4899: 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 @@ -4867,7 +4903,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4893,7 +4929,7 @@ } EOF -if { (eval echo configure:4897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4933: \"$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 @@ -4913,7 +4949,7 @@ echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:4917: checking size of uint64_t" >&5 +echo "configure:4953: 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 @@ -4921,7 +4957,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4947,7 +4983,7 @@ } EOF -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4987: \"$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 @@ -4967,7 +5003,7 @@ echo $ac_n "checking size of u_int64_t""... $ac_c" 1>&6 -echo "configure:4971: checking size of u_int64_t" >&5 +echo "configure:5007: 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 @@ -4975,7 +5011,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -5001,7 +5037,7 @@ } EOF -if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5041: \"$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 @@ -5023,12 +5059,12 @@ if test "x$ac_cv_sizeof_short" = "x2"; then echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:5027: checking for int16_t" >&5 +echo "configure:5063: 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:5076: checking for int16_t" >&5 +echo "configure:5112: 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:5126: checking for u_int16_t" >&5 +echo "configure:5162: 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:5175: checking for u_int16_t" >&5 +echo "configure:5211: 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:5224: checking for u_int16_t" >&5 +echo "configure:5260: 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:5274: checking for int32_t" >&5 +echo "configure:5310: 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:5323: checking for int32_t" >&5 +echo "configure:5359: 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:5373: checking for u_int32_t" >&5 +echo "configure:5409: 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:5422: checking for u_int32_t" >&5 +echo "configure:5458: 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:5471: checking for u_int32_t" >&5 +echo "configure:5507: 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:5521: checking for int64_t" >&5 +echo "configure:5557: 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:5570: checking for int64_t" >&5 +echo "configure:5606: 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:5619: checking for int64_t" >&5 +echo "configure:5655: 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:5669: checking for u_int64_t" >&5 +echo "configure:5705: 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:5718: checking for u_int64_t" >&5 +echo "configure:5754: 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:5767: checking for u_int64_t" >&5 +echo "configure:5803: 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:5816: checking for int64_t" >&5 +echo "configure:5852: 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:5866: checking for pid_t" >&5 +echo "configure:5902: 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 @@ -5895,12 +5931,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5899: checking for size_t" >&5 +echo "configure:5935: 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 @@ -5928,12 +5964,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:5932: checking for ssize_t" >&5 +echo "configure:5968: 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 @@ -5961,12 +5997,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5965: checking for off_t" >&5 +echo "configure:6001: 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 @@ -5994,12 +6030,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5998: checking for mode_t" >&5 +echo "configure:6034: 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 @@ -6027,12 +6063,12 @@ fi echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 -echo "configure:6031: checking for fd_mask" >&5 +echo "configure:6067: 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 @@ -6061,7 +6097,7 @@ echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:6065: checking size of off_t" >&5 +echo "configure:6101: 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 @@ -6069,7 +6105,7 @@ ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext < @@ -6095,7 +6131,7 @@ } EOF -if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6135: \"$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 @@ -6115,7 +6151,7 @@ echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:6119: checking size of size_t" >&5 +echo "configure:6155: 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 @@ -6123,7 +6159,7 @@ ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < @@ -6149,7 +6185,7 @@ } EOF -if { (eval echo configure:6153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6189: \"$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 @@ -6172,19 +6208,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:6176: checking for working alloca.h" >&5 +echo "configure:6212: 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:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6224: \"$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 @@ -6205,12 +6241,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6209: checking for alloca" >&5 +echo "configure:6245: 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:6278: \"$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 @@ -6270,12 +6306,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6274: checking whether alloca needs Cray hooks" >&5 +echo "configure:6310: 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:6304: checking for $ac_func" >&5 +echo "configure:6340: 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:6368: \"$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 @@ -6355,7 +6391,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6359: checking stack direction for C alloca" >&5 +echo "configure:6395: 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 @@ -6363,7 +6399,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:6422: \"$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 @@ -6406,13 +6442,13 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:6410: checking for socklen_t" >&5 +echo "configure:6446: 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 @@ -6443,13 +6479,13 @@ fi echo $ac_n "checking for mtyp_t""... $ac_c" 1>&6 -echo "configure:6447: checking for mtyp_t" >&5 +echo "configure:6483: 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 @@ -6477,7 +6513,7 @@ fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:6481: checking for main in -lnsl" >&5 +echo "configure:6517: 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 @@ -6485,14 +6521,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:6532: \"$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 @@ -6520,7 +6556,7 @@ fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:6524: checking for main in -lsocket" >&5 +echo "configure:6560: 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 @@ -6528,14 +6564,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:6575: \"$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 @@ -6564,13 +6600,13 @@ echo $ac_n "checking for unix domain sockets""... $ac_c" 1>&6 -echo "configure:6568: checking for unix domain sockets" >&5 +echo "configure:6604: 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 < @@ -6585,7 +6621,7 @@ ; return 0; } EOF -if { (eval echo configure:6589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* squid_cv_unixsocket=yes else @@ -6609,7 +6645,7 @@ echo "skipping libmalloc check (--enable-dlmalloc specified)" else echo $ac_n "checking for main in -lgnumalloc""... $ac_c" 1>&6 -echo "configure:6613: checking for main in -lgnumalloc" >&5 +echo "configure:6649: 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 @@ -6617,14 +6653,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:6664: \"$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 @@ -6667,7 +6703,7 @@ *) echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6 -echo "configure:6671: checking for main in -lmalloc" >&5 +echo "configure:6707: 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 @@ -6675,14 +6711,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:6722: \"$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 @@ -6715,7 +6751,7 @@ fi echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:6719: checking for main in -lbsd" >&5 +echo "configure:6755: 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 @@ -6723,14 +6759,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:6770: \"$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 @@ -6758,7 +6794,7 @@ fi echo $ac_n "checking for main in -lregex""... $ac_c" 1>&6 -echo "configure:6762: checking for main in -lregex" >&5 +echo "configure:6798: 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 @@ -6766,14 +6802,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:6813: \"$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 @@ -6794,7 +6830,7 @@ fi echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:6798: checking for gethostbyname in -lbind" >&5 +echo "configure:6834: 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 @@ -6802,7 +6838,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:6853: \"$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 @@ -6847,7 +6883,7 @@ ;; *) echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:6851: checking for inet_aton in -lresolv" >&5 +echo "configure:6887: 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 @@ -6855,7 +6891,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:6906: \"$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 @@ -6882,7 +6918,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:6886: checking for inet_aton in -l44bsd" >&5 +echo "configure:6922: 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 @@ -6890,7 +6926,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:6941: \"$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 @@ -6933,7 +6969,7 @@ fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:6937: checking for main in -lresolv" >&5 +echo "configure:6973: 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 @@ -6941,14 +6977,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:6988: \"$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 @@ -6979,7 +7015,7 @@ esac fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6983: checking for main in -lm" >&5 +echo "configure:7019: 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 @@ -6987,14 +7023,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:7034: \"$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 @@ -7023,7 +7059,7 @@ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7027: checking for crypt in -lcrypt" >&5 +echo "configure:7063: 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 @@ -7031,7 +7067,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:7082: \"$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 @@ -7066,7 +7102,7 @@ if test "$with_dl" = "yes"; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7070: checking for dlopen in -ldl" >&5 +echo "configure:7106: 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 @@ -7074,7 +7110,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:7125: \"$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 @@ -7133,7 +7169,7 @@ ;; esac echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:7137: checking for main in -lpthread" >&5 +echo "configure:7173: 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 @@ -7141,14 +7177,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:7188: \"$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 @@ -7179,7 +7215,7 @@ if test "$with_aio" = "yes"; then echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6 -echo "configure:7183: checking for aio_read in -lrt" >&5 +echo "configure:7219: 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 @@ -7187,7 +7223,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:7238: \"$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 @@ -7230,7 +7266,7 @@ case "$host" in *-pc-sco3.2*) echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:7234: checking for strftime in -lintl" >&5 +echo "configure:7270: 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 @@ -7238,7 +7274,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:7289: \"$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 @@ -7367,9 +7403,10 @@ # Henrik Nordstrom (hno@squid-cache.org) 19980817 # poll is problematic on Linux. We disable it # by default until Linux gets it right. + # See also bug #932 rev=`uname -r | awk -F. '{printf "%03d%03d",$1,$2}'` - if test $rev -lt 002002; then - echo "disabling poll for $host < 2.2..." + if test $rev -lt 002004; then + echo "disabling poll for $host < 2.4..." ac_cv_func_poll='no' fi ;; @@ -7440,12 +7477,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7444: checking for $ac_func" >&5 +echo "configure:7481: 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:7509: \"$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 @@ -7494,7 +7531,7 @@ echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6 -echo "configure:7498: checking if setresuid is implemented" >&5 +echo "configure:7535: 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 @@ -7502,7 +7539,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -7515,7 +7552,7 @@ } EOF -if { (eval echo configure:7519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7556: \"$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 @@ -7561,7 +7598,7 @@ if test "$IPF_TRANSPARENT" ; then echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6 -echo "configure:7565: checking if IP-Filter header files are installed" >&5 +echo "configure:7602: 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" || @@ -7602,7 +7639,7 @@ if test "$PF_TRANSPARENT" ; then echo $ac_n "checking if PF header file is installed""... $ac_c" 1>&6 -echo "configure:7606: checking if PF header file is installed" >&5 +echo "configure:7643: 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" @@ -7627,7 +7664,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:7631: checking if Linux 2.4 kernel header files are installed" >&5 +echo "configure:7668: 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" @@ -7661,13 +7698,13 @@ esac fi echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6 -echo "configure:7665: checking if GNUregex needs to be compiled" >&5 +echo "configure:7702: 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 @@ -7675,7 +7712,7 @@ regex_t t; regcomp(&t,"",0); ; return 0; } EOF -if { (eval echo configure:7679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* USE_GNUREGEX="no" else @@ -7706,12 +7743,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7710: checking for $ac_func" >&5 +echo "configure:7747: 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:7775: \"$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 @@ -7762,12 +7799,12 @@ echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6 -echo "configure:7766: checking Default FD_SETSIZE value" >&5 +echo "configure:7803: 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:7833: \"$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 @@ -7811,7 +7848,7 @@ echo $ac_n "checking Maximum number of filedescriptors we can open""... $ac_c" 1>&6 -echo "configure:7815: checking Maximum number of filedescriptors we can open" >&5 +echo "configure:7852: checking Maximum number of filedescriptors we can open" >&5 TLDFLAGS="$LDFLAGS" case $host in i386-unknown-freebsd*) @@ -7823,7 +7860,7 @@ SQUID_MAXFD=256 else cat > conftest.$ac_ext < @@ -7883,7 +7920,7 @@ } EOF -if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7924: \"$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 @@ -7910,12 +7947,12 @@ LDFLAGS="$TLDFLAGS" echo $ac_n "checking Default UDP send buffer size""... $ac_c" 1>&6 -echo "configure:7914: checking Default UDP send buffer size" >&5 +echo "configure:7951: checking Default UDP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -7936,7 +7973,7 @@ } EOF -if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7977: \"$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 @@ -7955,12 +7992,12 @@ echo $ac_n "checking Default UDP receive buffer size""... $ac_c" 1>&6 -echo "configure:7959: checking Default UDP receive buffer size" >&5 +echo "configure:7996: checking Default UDP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -7981,7 +8018,7 @@ } EOF -if { (eval echo configure:7985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8022: \"$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 @@ -8000,12 +8037,12 @@ echo $ac_n "checking Default TCP send buffer size""... $ac_c" 1>&6 -echo "configure:8004: checking Default TCP send buffer size" >&5 +echo "configure:8041: checking Default TCP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -8026,7 +8063,7 @@ } EOF -if { (eval echo configure:8030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8067: \"$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 @@ -8045,12 +8082,12 @@ echo $ac_n "checking Default TCP receive buffer size""... $ac_c" 1>&6 -echo "configure:8049: checking Default TCP receive buffer size" >&5 +echo "configure:8086: checking Default TCP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -8071,7 +8108,7 @@ } EOF -if { (eval echo configure:8075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8112: \"$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 @@ -8090,19 +8127,19 @@ echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6 -echo "configure:8094: checking if sys_errlist is already defined" >&5 +echo "configure:8131: 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:8106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_needs_sys_errlist="no" else @@ -8124,16 +8161,16 @@ fi echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6 -echo "configure:8128: checking for libresolv _dns_ttl_ hack" >&5 +echo "configure:8165: 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:8174: \"$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 @@ -8149,12 +8186,12 @@ rm -f conftest* echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6 -echo "configure:8153: checking if inet_ntoa() actually works" >&5 +echo "configure:8190: checking if inet_ntoa() actually works" >&5 if test "$cross_compiling" = yes; then INET_NTOA_RESULT="broken" else cat > conftest.$ac_ext < @@ -8173,7 +8210,7 @@ } EOF -if { (eval echo configure:8177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8214: \"$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 @@ -8199,9 +8236,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:8203: checking for working statvfs() interface" >&5 +echo "configure:8240: checking for working statvfs() interface" >&5 cat > conftest.$ac_ext < @@ -8218,7 +8255,7 @@ ; return 0; } EOF -if { (eval echo configure:8222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_statvfs=yes else @@ -8238,12 +8275,12 @@ fi echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6 -echo "configure:8242: checking for _res.nsaddr_list" >&5 +echo "configure:8279: 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:8307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_nsaddr_list="yes" else @@ -8288,12 +8325,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:8292: checking for _res.ns_list" >&5 +echo "configure:8329: 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:8357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_ns_list="yes" else @@ -8578,6 +8615,7 @@ s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g +s%@PKGCONFIG@%$PKGCONFIG%g s%@CGIEXT@%$CGIEXT%g s%@ENABLE_WIN32SPECIFIC_TRUE@%$ENABLE_WIN32SPECIFIC_TRUE%g s%@ENABLE_WIN32SPECIFIC_FALSE@%$ENABLE_WIN32SPECIFIC_FALSE%g Index: squid/configure.in diff -u squid/configure.in:1.251.2.51 squid/configure.in:1.251.2.54 --- squid/configure.in:1.251.2.51 Sun Feb 29 15:28:17 2004 +++ squid/configure.in Mon Apr 5 11:19:46 2004 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.251.2.51 2004/02/29 22:28:17 hno Exp $ +dnl $Id: configure.in,v 1.251.2.54 2004/04/05 17:19:46 wessels Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.5.STABLE5-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.251.2.51 $)dnl +AC_REVISION($Revision: 1.251.2.54 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -32,6 +32,9 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a +dnl Check for pkg-config +AC_PATH_PROG(PKGCONFIG, pkg-config, /usr/bin/false) + dnl find out the exe extension for this platform. If it's not empty, use it for CGI's as well. AC_EXEEXT AC_OBJEXT @@ -62,7 +65,7 @@ CACHE_ICP_PORT="3130" fi -dnl Subsitutions +dnl Substitutions AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT) AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT) @@ -368,10 +371,10 @@ AC_SUBST(STORE_MODULES) AC_SUBST(STORE_MODULE_SUBDIRS) -dnl --enable-heap-replacement compability option +dnl --enable-heap-replacement compatibility option AC_ARG_ENABLE(heap-replacement, [ --enable-heap-replacement - Backwards compability option. Please use the + Backwards compatibility option. Please use the new --enable-removal-policies directive instead.], [ if test "$enableval" = "yes" ; then echo "--enable-heap-replacement is obsolete. please use the new" @@ -594,11 +597,9 @@ if test -z "$SSLLIB"; then SSLLIB="-lcrypto" # for MD5 routines fi - dnl This is a workaround for RedHat 9 brain damage.. - if test -d /usr/kerberos/include && test -z "$SSLLIBDIR" && test -f /usr/include/openssl/kssl.h; then - echo "OpenSSL depends on Kerberos" - SSLLIBDIR="/usr/kerberos/lib" - CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" + if $PKGCONFIG --exists openssl; then + SSLLIB="`$PKGCONFIG --libs openssl`" + CPPFLAGS="`$PKGCONFIG --cflags openssl` $CPPFLAGS" fi fi if test -n "$SSLLIBDIR"; then @@ -869,7 +870,7 @@ BASIC_AUTH_HELPERS="" AC_ARG_ENABLE(auth-modules, [ --enable-auth-modules=\"list of helpers\" - Backwards compability alias for + Backwards compatibility alias for --enable-basic-auth-helpers], [ echo "--enable-auth-modules is obsolete. Please use the new" echo "option --enable-basic-auth-helpers" @@ -1644,9 +1645,10 @@ # Henrik Nordstrom (hno@squid-cache.org) 19980817 # poll is problematic on Linux. We disable it # by default until Linux gets it right. + # See also bug #932 rev=`uname -r | awk -F. '{printf "%03d%03d",$1,$2}'` - if test $rev -lt 002002; then - echo "disabling poll for $host < 2.2..." + if test $rev -lt 002004; then + echo "disabling poll for $host < 2.4..." ac_cv_func_poll='no' fi ;; Index: squid/mkrelease.sh diff -u squid/mkrelease.sh:1.8.2.2 squid/mkrelease.sh:1.8.2.3 --- squid/mkrelease.sh:1.8.2.2 Fri Nov 7 10:03:26 2003 +++ squid/mkrelease.sh Wed Mar 3 05:12:37 2004 @@ -35,11 +35,11 @@ fi RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1` ed -s configure.in < Squid 2.5 release notes Squid Developers -$Id: release-2.5.sgml,v 1.1.2.41 2004/02/29 22:24:27 hno Exp $ +$Id: release-2.5.sgml,v 1.1.2.42 2004/04/01 22:53:18 hno Exp $ This document contains the release notes for version 2.5 of Squid. @@ -138,7 +138,6 @@ Bug wb_auth fails on TRU64 and probably other 64 bit platforms Bug delay_pools stops working on -k reconfigure Bug does not handle swap.state corruption properly -Bug Vary: * does not work Bug unstable if runs out of disk space Bug diskd may appear slow on low loads Index: squid/errors/Makefile.in diff -u squid/errors/Makefile.in:1.15.2.12 squid/errors/Makefile.in:1.15.2.13 --- squid/errors/Makefile.in:1.15.2.12 Mon Dec 1 03:13:57 2003 +++ squid/errors/Makefile.in Sat Mar 6 18:11:27 2004 @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.15.2.12 2003/12/01 10:13:57 hno Exp $ +# $Id: Makefile.in,v 1.15.2.13 2004/03/07 01:11:27 hno Exp $ # SHELL = @SHELL@ @@ -93,6 +93,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/errors/Turkish/ERR_DNS_FAIL diff -u squid/errors/Turkish/ERR_DNS_FAIL:1.2.12.2 squid/errors/Turkish/ERR_DNS_FAIL:1.2.12.3 --- squid/errors/Turkish/ERR_DNS_FAIL:1.2.12.2 Mon Aug 26 19:17:35 2002 +++ squid/errors/Turkish/ERR_DNS_FAIL Thu Apr 15 05:50:35 2004 @@ -13,7 +13,7 @@ adresine ulaşırken aşağıdaki hata oluştu:

-%H isimli sunucuya ayit herhangi bir IP adresi bulunamadı. +%H isimli sunucuya ait herhangi bir IP adresi bulunamadı.

Index: squid/helpers/Makefile.in diff -u squid/helpers/Makefile.in:1.1.2.5 squid/helpers/Makefile.in:1.1.2.6 --- squid/helpers/Makefile.in:1.1.2.5 Tue Feb 11 19:02:10 2003 +++ squid/helpers/Makefile.in Sat Mar 6 18:11:27 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/Makefile.in diff -u squid/helpers/basic_auth/Makefile.in:1.7.2.8 squid/helpers/basic_auth/Makefile.in:1.7.2.9 --- squid/helpers/basic_auth/Makefile.in:1.7.2.8 Tue Feb 11 19:02:10 2003 +++ squid/helpers/basic_auth/Makefile.in Sat Mar 6 18:11:27 2004 @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.8 2003/02/12 02:02:10 hno Exp $ +# $Id: Makefile.in,v 1.7.2.9 2004/03/07 01:11:27 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/LDAP/Makefile.in diff -u squid/helpers/basic_auth/LDAP/Makefile.in:1.8.2.9 squid/helpers/basic_auth/LDAP/Makefile.in:1.8.2.10 --- squid/helpers/basic_auth/LDAP/Makefile.in:1.8.2.9 Tue Feb 11 19:02:12 2003 +++ squid/helpers/basic_auth/LDAP/Makefile.in Sat Mar 6 18:11:28 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.8.2.9 2003/02/12 02:02:12 hno Exp $ +# $Id: Makefile.in,v 1.8.2.10 2004/03/07 01:11:28 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.8 diff -u squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.4 squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.5 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.4 Wed Feb 18 09:15:52 2004 +++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.8 Tue Mar 2 02:13:29 2004 @@ -132,6 +132,12 @@ .BI -t search_timeout Specify time limit on LDAP search operations . +.TP +.BU -d +Debug mode where each step taken will get reported in detail. +Useful for understanding what goes wrong if the results is +not what is expected. +. .SH EXAMPLES For directories using the RFC2307 layout with a single domain, all you need to specify is usually the base DN under where your users Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c diff -u squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.8 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.10 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.8 Mon Jan 5 06:12:11 2004 +++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c Thu Mar 4 02:37:38 2004 @@ -30,6 +30,10 @@ * or (at your option) any later version. * * Changes: + * 2004-03-01: Henrik Nordstrom + * - corrected building of search filters to escape + * unsafe input + * - -d option for "debug" like squid_ldap_group * 2004-01-05: Henrik Nordstrom * - Corrected TLS mode * 2003-03-01: David J N Begley @@ -95,6 +99,7 @@ #endif static int connect_timeout = 0; static int timelimit = LDAP_NO_LIMIT; +static int debug = 0; /* Added for TLS support and version 3 */ static int use_tls = 0; @@ -208,6 +213,7 @@ case 'R': case 'z': case 'Z': + case 'd': break; default: if (strlen(argv[1]) > 2) { @@ -333,6 +339,9 @@ use_tls = 1; break; #endif + case 'd': + debug++; + break; default: fprintf(stderr, PROGRAM_NAME ": ERROR: Unknown command line option '%c'\n", option); exit(1); @@ -478,6 +487,34 @@ } static int +ldap_escape_value(char *escaped, int size, const char *src) +{ + int n = 0; + while (size > 4 && *src) { + switch(*src) { + case '*': + case '(': + case ')': + case '\\': + n += 3; + size -= 3; + if (size > 0) { + *escaped++ = '\\'; + snprintf(escaped, 3, "%02x", (unsigned char)*src++); + escaped+=2; + } + break; + default: + *escaped++ = *src++; + n++; + size--; + } + } + *escaped = '\0'; + return n; +} + +static int checkLDAP(LDAP * ld, const char *userid, const char *password) { char dn[256]; @@ -490,6 +527,7 @@ } if (searchfilter) { char filter[256]; + char escaped_login[256]; LDAPMessage *res = NULL; LDAPMessage *entry; char *searchattr[] = @@ -497,6 +535,7 @@ char *userdn; int rc; + ldap_escape_value(escaped_login, sizeof(escaped_login), userid); if (binddn) { rc = ldap_simple_bind_s(ld, binddn, bindpasswd); if (rc != LDAP_SUCCESS) { @@ -504,7 +543,9 @@ return 1; } } - snprintf(filter, sizeof(filter), searchfilter, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid); + snprintf(filter, sizeof(filter), searchfilter, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login); + if (debug) + fprintf(stderr, "user filter '%s', searchbase '%s'\n", filter, basedn); rc = ldap_search_s(ld, basedn, searchscope, filter, searchattr, 1, &res); if (rc != LDAP_SUCCESS) { if (noreferrals && rc == LDAP_PARTIAL_RESULTS) { @@ -541,6 +582,8 @@ snprintf(dn, sizeof(dn), "%s=%s,%s", userattr, userid, basedn); } + if (debug) + fprintf(stderr, "attempting to bind to user '%s'\n", dn); if (ldap_simple_bind_s(ld, dn, password) != LDAP_SUCCESS) return 1; Index: squid/helpers/basic_auth/MSNT/Makefile.in diff -u squid/helpers/basic_auth/MSNT/Makefile.in:1.7.2.11 squid/helpers/basic_auth/MSNT/Makefile.in:1.7.2.12 --- squid/helpers/basic_auth/MSNT/Makefile.in:1.7.2.11 Tue Feb 11 19:02:16 2003 +++ squid/helpers/basic_auth/MSNT/Makefile.in Sat Mar 6 18:11:28 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.11 2003/02/12 02:02:16 hno Exp $ +# $Id: Makefile.in,v 1.7.2.12 2004/03/07 01:11:28 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/NCSA/Makefile.in diff -u squid/helpers/basic_auth/NCSA/Makefile.in:1.8.2.7 squid/helpers/basic_auth/NCSA/Makefile.in:1.8.2.8 --- squid/helpers/basic_auth/NCSA/Makefile.in:1.8.2.7 Tue Feb 11 19:02:22 2003 +++ squid/helpers/basic_auth/NCSA/Makefile.in Sat Mar 6 18:11:31 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.7 2003/02/12 02:02:22 hno Exp $ +# $Id: Makefile.in,v 1.8.2.8 2004/03/07 01:11:31 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/PAM/Makefile.in diff -u squid/helpers/basic_auth/PAM/Makefile.in:1.7.2.9 squid/helpers/basic_auth/PAM/Makefile.in:1.7.2.10 --- squid/helpers/basic_auth/PAM/Makefile.in:1.7.2.9 Tue Feb 11 19:02:23 2003 +++ squid/helpers/basic_auth/PAM/Makefile.in Sat Mar 6 18:11:31 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.7.2.9 2003/02/12 02:02:23 hno Exp $ +# $Id: Makefile.in,v 1.7.2.10 2004/03/07 01:11:31 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/SASL/Makefile.in diff -u squid/helpers/basic_auth/SASL/Makefile.in:1.1.2.13 squid/helpers/basic_auth/SASL/Makefile.in:1.1.2.14 --- squid/helpers/basic_auth/SASL/Makefile.in:1.1.2.13 Tue Feb 11 19:02:25 2003 +++ squid/helpers/basic_auth/SASL/Makefile.in Sat Mar 6 18:11:31 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.1.2.13 2003/02/12 02:02:25 hno Exp $ +# $Id: Makefile.in,v 1.1.2.14 2004/03/07 01:11:31 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/SMB/Makefile.in diff -u squid/helpers/basic_auth/SMB/Makefile.in:1.7.2.9 squid/helpers/basic_auth/SMB/Makefile.in:1.7.2.10 --- squid/helpers/basic_auth/SMB/Makefile.in:1.7.2.9 Tue Feb 11 19:02:25 2003 +++ squid/helpers/basic_auth/SMB/Makefile.in Sat Mar 6 18:11:31 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.9 2003/02/12 02:02:25 hno Exp $ +# $Id: Makefile.in,v 1.7.2.10 2004/03/07 01:11:31 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -102,6 +102,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/YP/Makefile.in diff -u squid/helpers/basic_auth/YP/Makefile.in:1.9.2.8 squid/helpers/basic_auth/YP/Makefile.in:1.9.2.9 --- squid/helpers/basic_auth/YP/Makefile.in:1.9.2.8 Tue Feb 11 19:02:25 2003 +++ squid/helpers/basic_auth/YP/Makefile.in Sat Mar 6 18:11:32 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.9.2.8 2003/02/12 02:02:25 hno Exp $ +# $Id: Makefile.in,v 1.9.2.9 2004/03/07 01:11:32 hno Exp $ # # @@ -96,6 +96,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/getpwnam/Makefile.in diff -u squid/helpers/basic_auth/getpwnam/Makefile.in:1.8.2.7 squid/helpers/basic_auth/getpwnam/Makefile.in:1.8.2.8 --- squid/helpers/basic_auth/getpwnam/Makefile.in:1.8.2.7 Tue Feb 11 19:02:27 2003 +++ squid/helpers/basic_auth/getpwnam/Makefile.in Sat Mar 6 18:11:32 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.7 2003/02/12 02:02:27 hno Exp $ +# $Id: Makefile.in,v 1.8.2.8 2004/03/07 01:11:32 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/multi-domain-NTLM/Makefile.in diff -u squid/helpers/basic_auth/multi-domain-NTLM/Makefile.in:1.5.2.8 squid/helpers/basic_auth/multi-domain-NTLM/Makefile.in:1.5.2.9 --- squid/helpers/basic_auth/multi-domain-NTLM/Makefile.in:1.5.2.8 Tue Feb 11 19:02:27 2003 +++ squid/helpers/basic_auth/multi-domain-NTLM/Makefile.in Sat Mar 6 18:11:32 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.5.2.8 2003/02/12 02:02:27 hno Exp $ +# $Id: Makefile.in,v 1.5.2.9 2004/03/07 01:11:32 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/basic_auth/winbind/Makefile.in diff -u squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.9 squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.10 --- squid/helpers/basic_auth/winbind/Makefile.in:1.1.2.9 Tue Feb 11 19:02:30 2003 +++ squid/helpers/basic_auth/winbind/Makefile.in Sat Mar 6 18:11:32 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1.2.9 2003/02/12 02:02:30 hno Exp $ +# $Id: Makefile.in,v 1.1.2.10 2004/03/07 01:11:32 hno Exp $ # SHELL = @SHELL@ @@ -95,6 +95,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/digest_auth/Makefile.in diff -u squid/helpers/digest_auth/Makefile.in:1.6.2.6 squid/helpers/digest_auth/Makefile.in:1.6.2.7 --- squid/helpers/digest_auth/Makefile.in:1.6.2.6 Tue Feb 11 19:02:32 2003 +++ squid/helpers/digest_auth/Makefile.in Sat Mar 6 18:11:32 2004 @@ -15,7 +15,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.6.2.6 2003/02/12 02:02:32 hno Exp $ +# $Id: Makefile.in,v 1.6.2.7 2004/03/07 01:11:32 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/digest_auth/password/Makefile.in diff -u squid/helpers/digest_auth/password/Makefile.in:1.8.2.6 squid/helpers/digest_auth/password/Makefile.in:1.8.2.7 --- squid/helpers/digest_auth/password/Makefile.in:1.8.2.6 Tue Feb 11 19:02:35 2003 +++ squid/helpers/digest_auth/password/Makefile.in Sat Mar 6 18:11:33 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.6 2003/02/12 02:02:35 hno Exp $ +# $Id: Makefile.in,v 1.8.2.7 2004/03/07 01:11:33 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/Makefile.in diff -u squid/helpers/external_acl/Makefile.in:1.2.2.3 squid/helpers/external_acl/Makefile.in:1.2.2.4 --- squid/helpers/external_acl/Makefile.in:1.2.2.3 Tue Feb 11 19:02:37 2003 +++ squid/helpers/external_acl/Makefile.in Sat Mar 6 18:11:33 2004 @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.2.2.3 2003/02/12 02:02:37 hno Exp $ +# $Id: Makefile.in,v 1.2.2.4 2004/03/07 01:11:33 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/ip_user/Makefile.in diff -u squid/helpers/external_acl/ip_user/Makefile.in:1.1.2.4 squid/helpers/external_acl/ip_user/Makefile.in:1.1.2.5 --- squid/helpers/external_acl/ip_user/Makefile.in:1.1.2.4 Tue Feb 11 19:02:38 2003 +++ squid/helpers/external_acl/ip_user/Makefile.in Sat Mar 6 18:11:33 2004 @@ -16,7 +16,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.1.2.4 2003/02/12 02:02:38 hno Exp $ +# $Id: Makefile.in,v 1.1.2.5 2004/03/07 01:11:33 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/ldap_group/Makefile.in diff -u squid/helpers/external_acl/ldap_group/Makefile.in:1.1.2.6 squid/helpers/external_acl/ldap_group/Makefile.in:1.1.2.7 --- squid/helpers/external_acl/ldap_group/Makefile.in:1.1.2.6 Wed Nov 19 17:43:41 2003 +++ squid/helpers/external_acl/ldap_group/Makefile.in Sat Mar 6 18:11:34 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.1.2.6 2003/11/20 00:43:41 hno Exp $ +# $Id: Makefile.in,v 1.1.2.7 2004/03/07 01:11:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.8 diff -u squid/helpers/external_acl/ldap_group/squid_ldap_group.8:1.1.2.3 squid/helpers/external_acl/ldap_group/squid_ldap_group.8:1.1.2.4 --- squid/helpers/external_acl/ldap_group/squid_ldap_group.8:1.1.2.3 Wed Nov 19 17:41:37 2003 +++ squid/helpers/external_acl/ldap_group/squid_ldap_group.8 Tue Mar 2 02:13:29 2004 @@ -138,6 +138,12 @@ .BI -S Strip NT domain name component from user names (/ or \\ separated) . +.TP +.BU -d +Debug mode where each step taken will get reported in detail. +Useful for understanding what goes wrong if the results is +not what is expected. + .SH SQUID CONFIGURATION . This helper is intended to be used as a external_acl_type helper from Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c diff -u squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.16 squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.17 --- squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.16 Mon Feb 9 10:04:56 2004 +++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c Tue Mar 2 02:13:29 2004 @@ -229,6 +229,7 @@ case 'R': case 'z': case 'Z': + case 'd': case 'g': case 'S': break; @@ -558,7 +559,7 @@ size -= 3; if (size > 0) { *escaped++ = '\\'; - snprintf(escaped, 3, "%02x", (int)*src++); + snprintf(escaped, 3, "%02x", (unsigned char)*src++); escaped+=2; } break; Index: squid/helpers/external_acl/unix_group/Makefile.in diff -u squid/helpers/external_acl/unix_group/Makefile.in:1.1.2.4 squid/helpers/external_acl/unix_group/Makefile.in:1.1.2.5 --- squid/helpers/external_acl/unix_group/Makefile.in:1.1.2.4 Tue Feb 11 19:02:44 2003 +++ squid/helpers/external_acl/unix_group/Makefile.in Sat Mar 6 18:11:34 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.1.2.4 2003/02/12 02:02:44 hno Exp $ +# $Id: Makefile.in,v 1.1.2.5 2004/03/07 01:11:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/wbinfo_group/Makefile.in diff -u squid/helpers/external_acl/wbinfo_group/Makefile.in:1.1.2.3 squid/helpers/external_acl/wbinfo_group/Makefile.in:1.1.2.4 --- squid/helpers/external_acl/wbinfo_group/Makefile.in:1.1.2.3 Tue Feb 11 19:02:48 2003 +++ squid/helpers/external_acl/wbinfo_group/Makefile.in Sat Mar 6 18:11:34 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.1.2.3 2003/02/12 02:02:48 hno Exp $ +# $Id: Makefile.in,v 1.1.2.4 2004/03/07 01:11:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/external_acl/winbind_group/Makefile.in diff -u squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.5 squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.6 --- squid/helpers/external_acl/winbind_group/Makefile.in:1.1.2.5 Fri May 16 18:16:14 2003 +++ squid/helpers/external_acl/winbind_group/Makefile.in Sat Mar 6 18:11:34 2004 @@ -16,7 +16,7 @@ # # Makefile for the wb_group external_acl helper # -# $Id: Makefile.in,v 1.1.2.5 2003/05/17 00:16:14 hno Exp $ +# $Id: Makefile.in,v 1.1.2.6 2004/03/07 01:11:34 hno Exp $ # SHELL = @SHELL@ @@ -95,6 +95,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/Makefile.in diff -u squid/helpers/ntlm_auth/Makefile.in:1.7.2.8 squid/helpers/ntlm_auth/Makefile.in:1.7.2.9 --- squid/helpers/ntlm_auth/Makefile.in:1.7.2.8 Tue Feb 11 19:02:52 2003 +++ squid/helpers/ntlm_auth/Makefile.in Sat Mar 6 18:11:35 2004 @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.8 2003/02/12 02:02:52 hno Exp $ +# $Id: Makefile.in,v 1.7.2.9 2004/03/07 01:11:35 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/SMB/Makefile.in diff -u squid/helpers/ntlm_auth/SMB/Makefile.in:1.8.2.7 squid/helpers/ntlm_auth/SMB/Makefile.in:1.8.2.8 --- squid/helpers/ntlm_auth/SMB/Makefile.in:1.8.2.7 Tue Feb 11 19:02:56 2003 +++ squid/helpers/ntlm_auth/SMB/Makefile.in Sat Mar 6 18:11:35 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.7 2003/02/12 02:02:56 hno Exp $ +# $Id: Makefile.in,v 1.8.2.8 2004/03/07 01:11:35 hno Exp $ # SHELL = @SHELL@ @@ -95,6 +95,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/SMB/smbval/Makefile.in diff -u squid/helpers/ntlm_auth/SMB/smbval/Makefile.in:1.6.2.7 squid/helpers/ntlm_auth/SMB/smbval/Makefile.in:1.6.2.8 --- squid/helpers/ntlm_auth/SMB/smbval/Makefile.in:1.6.2.7 Tue Feb 11 19:02:58 2003 +++ squid/helpers/ntlm_auth/SMB/smbval/Makefile.in Sat Mar 6 18:11:35 2004 @@ -91,6 +91,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/fakeauth/Makefile.in diff -u squid/helpers/ntlm_auth/fakeauth/Makefile.in:1.8.2.6 squid/helpers/ntlm_auth/fakeauth/Makefile.in:1.8.2.7 --- squid/helpers/ntlm_auth/fakeauth/Makefile.in:1.8.2.6 Tue Feb 11 19:02:58 2003 +++ squid/helpers/ntlm_auth/fakeauth/Makefile.in Sat Mar 6 18:11:35 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.6 2003/02/12 02:02:58 hno Exp $ +# $Id: Makefile.in,v 1.8.2.7 2004/03/07 01:11:35 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/no_check/Makefile.in diff -u squid/helpers/ntlm_auth/no_check/Makefile.in:1.8.2.8 squid/helpers/ntlm_auth/no_check/Makefile.in:1.8.2.9 --- squid/helpers/ntlm_auth/no_check/Makefile.in:1.8.2.8 Tue Feb 11 19:03:01 2003 +++ squid/helpers/ntlm_auth/no_check/Makefile.in Sat Mar 6 18:11:36 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.8 2003/02/12 02:03:01 hno Exp $ +# $Id: Makefile.in,v 1.8.2.9 2004/03/07 01:11:36 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/helpers/ntlm_auth/winbind/Makefile.in diff -u squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.9 squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.10 --- squid/helpers/ntlm_auth/winbind/Makefile.in:1.1.2.9 Tue Feb 11 19:03:06 2003 +++ squid/helpers/ntlm_auth/winbind/Makefile.in Sat Mar 6 18:11:37 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1.2.9 2003/02/12 02:03:06 hno Exp $ +# $Id: Makefile.in,v 1.1.2.10 2004/03/07 01:11:37 hno Exp $ # SHELL = @SHELL@ @@ -95,6 +95,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/icons/Makefile.in diff -u squid/icons/Makefile.in:1.21.2.8 squid/icons/Makefile.in:1.21.2.9 --- squid/icons/Makefile.in:1.21.2.8 Wed May 21 18:15:40 2003 +++ squid/icons/Makefile.in Sat Mar 6 18:11:37 2004 @@ -13,7 +13,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.21.2.8 2003/05/22 00:15:40 hno Exp $ +# $Id: Makefile.in,v 1.21.2.9 2004/03/07 01:11:37 hno Exp $ # SHELL = @SHELL@ @@ -92,6 +92,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/include/config.h diff -u squid/include/config.h:1.4 squid/include/config.h:1.4.2.1 --- squid/include/config.h:1.4 Tue Nov 13 14:27:47 2001 +++ squid/include/config.h Sat Apr 17 19:29:51 2004 @@ -1,5 +1,5 @@ /* - * $Id: config.h,v 1.4 2001/11/13 21:27:47 hno Exp $ + * $Id: config.h,v 1.4.2.1 2004/04/18 01:29:51 hno Exp $ * * AUTHOR: Duane Wessels * @@ -163,6 +163,7 @@ #define xisascii(x) isascii((unsigned char)x) #define xislower(x) islower((unsigned char)x) #define xisalpha(x) isalpha((unsigned char)x) +#define xisgraph(x) isgraph((unsigned char)x) #if HAVE_RANDOM #define squid_random random Index: squid/lib/Makefile.in diff -u squid/lib/Makefile.in:1.57.2.5 squid/lib/Makefile.in:1.57.2.6 --- squid/lib/Makefile.in:1.57.2.5 Tue Feb 11 19:03:10 2003 +++ squid/lib/Makefile.in Sat Mar 6 18:11:38 2004 @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.57.2.5 2003/02/12 02:03:10 hno Exp $ +# $Id: Makefile.in,v 1.57.2.6 2004/03/07 01:11:38 hno Exp $ # SHELL = @SHELL@ @@ -93,6 +93,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/lib/rfc1035.c diff -u squid/lib/rfc1035.c:1.22.2.4 squid/lib/rfc1035.c:1.22.2.5 --- squid/lib/rfc1035.c:1.22.2.4 Fri Apr 25 06:09:57 2003 +++ squid/lib/rfc1035.c Sun Apr 11 03:14:52 2004 @@ -1,6 +1,6 @@ /* - * $Id: rfc1035.c,v 1.22.2.4 2003/04/25 12:09:57 hno Exp $ + * $Id: rfc1035.c,v 1.22.2.5 2004/04/11 09:14:52 hno Exp $ * * Low level DNS protocol routines * AUTHOR: Duane Wessels @@ -337,7 +337,7 @@ break; if (len > (ns - no - 1)) /* label won't fit */ return 1; - if ((*off) + len > sz) /* message is too short */ + if ((*off) + len >= sz) /* message is too short */ return 1; memcpy(name + no, buf + (*off), len); (*off) += len; Index: squid/scripts/Makefile.in diff -u squid/scripts/Makefile.in:1.12.2.5 squid/scripts/Makefile.in:1.12.2.6 --- squid/scripts/Makefile.in:1.12.2.5 Tue Feb 11 19:03:12 2003 +++ squid/scripts/Makefile.in Sat Mar 6 18:11:38 2004 @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/snmplib/Makefile.in diff -u squid/snmplib/Makefile.in:1.20.2.5 squid/snmplib/Makefile.in:1.20.2.6 --- squid/snmplib/Makefile.in:1.20.2.5 Tue Feb 11 19:03:12 2003 +++ squid/snmplib/Makefile.in Sat Mar 6 18:11:38 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/Makefile.in diff -u squid/src/Makefile.in:1.225.2.12 squid/src/Makefile.in:1.225.2.13 --- squid/src/Makefile.in:1.225.2.12 Tue Feb 11 19:03:14 2003 +++ squid/src/Makefile.in Sat Mar 6 18:11:38 2004 @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.225.2.12 2003/02/12 02:03:14 hno Exp $ +# $Id: Makefile.in,v 1.225.2.13 2004/03/07 01:11:38 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -97,6 +97,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/authenticate.c diff -u squid/src/authenticate.c:1.36.2.14 squid/src/authenticate.c:1.36.2.15 --- squid/src/authenticate.c:1.36.2.14 Wed Feb 18 11:51:16 2004 +++ squid/src/authenticate.c Sat Apr 17 19:29:51 2004 @@ -1,6 +1,6 @@ /* - * $Id: authenticate.c,v 1.36.2.14 2004/02/18 18:51:16 hno Exp $ + * $Id: authenticate.c,v 1.36.2.15 2004/04/18 01:29:51 hno Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -94,7 +94,11 @@ /* we're configured to use this scheme - but is it active ? */ if ((i = authenticateAuthSchemeId(proxy_auth)) != -1) { authscheme_list[i].decodeauth(auth_user_request, proxy_auth); - auth_user_request->auth_user->auth_module = i + 1; + if (auth_user_request->auth_user) { + auth_user_request->auth_user->auth_module = i + 1; + } else { + debug(29, 1) ("authenticateDecodeAuth: Invalid proxy-auth header, '%s'\n", proxy_auth); + } return; } } Index: squid/src/cf.data.pre diff -u squid/src/cf.data.pre:1.245.2.61 squid/src/cf.data.pre:1.245.2.64 --- squid/src/cf.data.pre:1.245.2.61 Tue Feb 10 14:01:21 2004 +++ squid/src/cf.data.pre Sun Apr 11 14:27:57 2004 @@ -1,6 +1,6 @@ # -# $Id: cf.data.pre,v 1.245.2.61 2004/02/10 21:01:21 hno Exp $ +# $Id: cf.data.pre,v 1.245.2.64 2004/04/11 20:27:57 hno Exp $ # # # SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -862,14 +862,14 @@ DOC_END -NAME: cache_swap_log +NAME: cache_swap_log cache_swap_state TYPE: string LOC: Config.Log.swap DEFAULT: none DOC_START - Location for the cache "swap.log." This log file holds the - metadata of objects saved on disk. It is used to rebuild the - cache during startup. Normally this file resides in each + Location for the cache "swap.state" file. This log file holds + the metadata of objects saved on disk. It is used to rebuild + the cache during startup. Normally this file resides in each 'cache_dir' directory, but you may specify an alternate pathname here. Note you must give a full filename, not just a directory. Since this is the index for the whole object @@ -1342,8 +1342,8 @@ "program" cmdline Specify the command for the external authenticator. Such a program reads a line containing "username":"realm" and replies with the - appropriate H(A1) value base64 encoded. See rfc 2616 for the - definition of H(A1). + appropriate H(A1) value base64 encoded or ERR if the user (or his H(A1) + hash) does not exists. See rfc 2616 for the definition of H(A1). By default, the digest authentication scheme is not used unless a program is specified. @@ -2548,8 +2548,8 @@ DOC_START If you are running Squid as an accelerator and have a single backend server then set this to on. This causes Squid to forward the request - to this server irregardles of what any redirectors or Host headers - says. + to this server, regardles of what any redirectors or Host headers + say. Leave this at off if you have multiple backend servers, and use a redirector (or host table or private DNS) to map the requests to the Index: squid/src/errorpage.c diff -u squid/src/errorpage.c:1.167.2.9 squid/src/errorpage.c:1.167.2.10 --- squid/src/errorpage.c:1.167.2.9 Thu Nov 6 09:13:03 2003 +++ squid/src/errorpage.c Mon Mar 29 02:41:36 2004 @@ -1,6 +1,6 @@ /* - * $Id: errorpage.c,v 1.167.2.9 2003/11/06 16:13:03 hno Exp $ + * $Id: errorpage.c,v 1.167.2.10 2004/03/29 09:41:36 hno Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels @@ -606,9 +606,11 @@ httpBuildVersion(&version, 1, 0); if (strchr(name, ':')) { /* Redirection */ - char *quoted_url = rfc1738_escape_part(errorConvert('u', err)); httpReplySetHeaders(rep, version, HTTP_MOVED_TEMPORARILY, NULL, "text/html", 0, 0, squid_curtime); - httpHeaderPutStrf(&rep->header, HDR_LOCATION, name, quoted_url); + if (err->request) { + char *quoted_url = rfc1738_escape_part(urlCanonical(err->request)); + httpHeaderPutStrf(&rep->header, HDR_LOCATION, name, quoted_url); + } httpHeaderPutStrf(&rep->header, HDR_X_SQUID_ERROR, "%d %s\n", err->http_status, "Access Denied"); } else { MemBuf content = errorBuildContent(err); Index: squid/src/helper.c diff -u squid/src/helper.c:1.34.2.15 squid/src/helper.c:1.34.2.16 --- squid/src/helper.c:1.34.2.15 Mon Feb 9 02:03:49 2004 +++ squid/src/helper.c Thu Mar 11 08:26:30 2004 @@ -1,6 +1,6 @@ /* - * $Id: helper.c,v 1.34.2.15 2004/02/09 09:03:49 hno Exp $ + * $Id: helper.c,v 1.34.2.16 2004/03/11 15:26:30 hno Exp $ * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? @@ -743,19 +743,19 @@ hlp->stats.queue_size++; if (hlp->stats.queue_size < hlp->n_running) return; - if (hlp->stats.queue_size < hlp->n_running) - return; + if (hlp->stats.queue_size > hlp->stats.max_queue_size) + hlp->stats.max_queue_size = hlp->stats.queue_size; if (squid_curtime - hlp->last_queue_warn < 30) return; if (shutting_down || reconfiguring) return; - hlp->last_queue_warn = squid_curtime; debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); if (hlp->stats.queue_size > hlp->n_running * 2) fatalf("Too many queued %s requests (%d on %d)", hlp->id_name, hlp->stats.queue_size, hlp->n_running); - if (hlp->stats.max_queue_size > 1) + if (squid_curtime - hlp->last_queue_warn < 300) debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); + hlp->last_queue_warn = squid_curtime; hlp->stats.max_queue_size = hlp->stats.queue_size; } @@ -775,11 +775,11 @@ return; if (shutting_down || reconfiguring) return; - hlp->last_queue_warn = squid_curtime; debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); - if (hlp->stats.max_queue_size > 1) + if (squid_curtime - hlp->last_queue_warn < 300) debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); + hlp->last_queue_warn = squid_curtime; hlp->stats.max_queue_size = hlp->stats.queue_size; } Index: squid/src/http.c diff -u squid/src/http.c:1.384.2.12 squid/src/http.c:1.384.2.14 --- squid/src/http.c:1.384.2.12 Fri Jan 30 16:09:12 2004 +++ squid/src/http.c Sun Apr 18 17:43:30 2004 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.384.2.12 2004/01/30 23:09:12 hno Exp $ + * $Id: http.c,v 1.384.2.14 2004/04/18 23:43:30 hno Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -348,6 +348,13 @@ char *name = xmalloc(ilen + 1); xstrncpy(name, item, ilen + 1); Tolower(name); + if (strcmp(name, "*") == 0) { + /* Can not handle "Vary: *" withtout ETag support */ + safe_free(name); + stringClean(&vary); + stringClean(&vstr); + break; + } strListAdd(&vstr, name, ','); hdr = httpHeaderGetByName(&request->header, name); safe_free(name); @@ -708,10 +715,12 @@ if (errflag == COMM_ERR_CLOSING) return; if (errflag) { - err = errorCon(ERR_WRITE_ERROR, HTTP_INTERNAL_SERVER_ERROR); - err->xerrno = errno; - err->request = requestLink(httpState->orig_request); - errorAppendEntry(entry, err); + if (entry->mem_obj->inmem_hi == 0) { + err = errorCon(ERR_WRITE_ERROR, HTTP_INTERNAL_SERVER_ERROR); + err->xerrno = errno; + err->request = requestLink(httpState->orig_request); + errorAppendEntry(entry, err); + } comm_close(fd); return; } else { @@ -1103,6 +1112,15 @@ } static void +httpRequestBodyHandler2(void *data) +{ + HttpStateData *httpState = (HttpStateData *) data; + char *buf = httpState->body_buf; + httpState->body_buf = NULL; + comm_write(httpState->fd, buf, httpState->body_buf_sz, httpSendRequestEntry, data, memFree8K); +} + +static void httpRequestBodyHandler(char *buf, ssize_t size, void *data) { HttpStateData *httpState = (HttpStateData *) data; @@ -1118,6 +1136,12 @@ comm_close(httpState->fd); return; } + httpState->body_buf = buf; + httpState->body_buf_sz = size; + /* Give response some time to propagate before sending rest + * of request in case of error */ + eventAdd("POST delay on response", httpRequestBodyHandler2, httpState, 2.0, 1); + return; } comm_write(httpState->fd, buf, size, httpSendRequestEntry, data, memFree8K); } else if (size == 0) { @@ -1147,10 +1171,12 @@ if (errflag == COMM_ERR_CLOSING) return; if (errflag) { - err = errorCon(ERR_WRITE_ERROR, HTTP_INTERNAL_SERVER_ERROR); - err->xerrno = errno; - err->request = requestLink(httpState->orig_request); - errorAppendEntry(entry, err); + if (entry->mem_obj->inmem_hi == 0) { + err = errorCon(ERR_WRITE_ERROR, HTTP_INTERNAL_SERVER_ERROR); + err->xerrno = errno; + err->request = requestLink(httpState->orig_request); + errorAppendEntry(entry, err); + } comm_close(fd); return; } Index: squid/src/ssl.c diff -u squid/src/ssl.c:1.118.2.4 squid/src/ssl.c:1.118.2.5 --- squid/src/ssl.c:1.118.2.4 Wed Aug 6 07:49:02 2003 +++ squid/src/ssl.c Mon Mar 29 02:59:44 2004 @@ -1,6 +1,6 @@ /* - * $Id: ssl.c,v 1.118.2.4 2003/08/06 13:49:02 hno Exp $ + * $Id: ssl.c,v 1.118.2.5 2004/03/29 09:59:44 hno Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -218,7 +218,7 @@ if (!ignoreErrno(errno)) comm_close(fd); } else if (len == 0) { - comm_close(sslState->server.fd); + comm_close(fd); } if (cbdataValid(sslState)) sslSetSelect(sslState); @@ -376,10 +376,13 @@ { SslStateData *sslState = data; assert(sslState != NULL); + /* temporary lock to save our own feets (comm_close -> sslClientClosed -> Free) */ + cbdataLock(sslState); if (sslState->client.fd > -1) comm_close(sslState->client.fd); if (sslState->server.fd > -1) comm_close(sslState->server.fd); + cbdataUnlock(sslState); } @@ -432,6 +435,33 @@ } } +static void +sslConnectTimeout(int fd, void *data) +{ + SslStateData *sslState = data; + request_t *request = sslState->request; + ErrorState *err = NULL; + if (sslState->servers->peer) + hierarchyNote(&sslState->request->hier, sslState->servers->code, + sslState->servers->peer->host); + else if (Config.onoff.log_ip_on_direct) + hierarchyNote(&sslState->request->hier, sslState->servers->code, + fd_table[sslState->server.fd].ipaddr); + else + hierarchyNote(&sslState->request->hier, sslState->servers->code, + sslState->host); + comm_close(fd); + err = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE); + *sslState->status_ptr = HTTP_SERVICE_UNAVAILABLE; + err->xerrno = ETIMEDOUT; + err->host = xstrdup(sslState->host); + err->port = sslState->port; + err->request = requestLink(request); + err->callback = sslErrorComplete; + err->callback_data = sslState; + errorSend(sslState->client.fd, err); +} + CBDATA_TYPE(SslStateData); void sslStart(clientHttpRequest * http, size_t * size_ptr, int *status_ptr) @@ -526,7 +556,7 @@ sslState); commSetTimeout(sslState->server.fd, Config.Timeout.connect, - sslTimeout, + sslConnectTimeout, sslState); peerSelect(request, NULL, Index: squid/src/structs.h diff -u squid/src/structs.h:1.408.2.23 squid/src/structs.h:1.408.2.24 --- squid/src/structs.h:1.408.2.23 Wed Feb 4 10:42:28 2004 +++ squid/src/structs.h Sun Apr 18 17:43:30 2004 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.408.2.23 2004/02/04 17:42:28 hno Exp $ + * $Id: structs.h,v 1.408.2.24 2004/04/18 23:43:30 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -986,6 +986,7 @@ http_state_flags flags; FwdState *fwd; char *body_buf; + int body_buf_sz; }; struct _icpUdpData { Index: squid/src/auth/Makefile.in diff -u squid/src/auth/Makefile.in:1.6.2.5 squid/src/auth/Makefile.in:1.6.2.6 --- squid/src/auth/Makefile.in:1.6.2.5 Tue Feb 11 19:03:15 2003 +++ squid/src/auth/Makefile.in Sat Mar 6 18:11:39 2004 @@ -15,7 +15,7 @@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.6.2.5 2003/02/12 02:03:15 hno Exp $ +# $Id: Makefile.in,v 1.6.2.6 2004/03/07 01:11:39 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/auth/basic/Makefile.in diff -u squid/src/auth/basic/Makefile.in:1.6.2.6 squid/src/auth/basic/Makefile.in:1.6.2.7 --- squid/src/auth/basic/Makefile.in:1.6.2.6 Tue Feb 11 19:03:19 2003 +++ squid/src/auth/basic/Makefile.in Sat Mar 6 18:11:39 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/auth/basic/auth_basic.c diff -u squid/src/auth/basic/auth_basic.c:1.14.2.5 squid/src/auth/basic/auth_basic.c:1.14.2.6 --- squid/src/auth/basic/auth_basic.c:1.14.2.5 Wed Feb 18 10:50:51 2004 +++ squid/src/auth/basic/auth_basic.c Sat Apr 17 19:29:52 2004 @@ -1,5 +1,5 @@ /* - * $Id: auth_basic.c,v 1.14.2.5 2004/02/18 17:50:51 hno Exp $ + * $Id: auth_basic.c,v 1.14.2.6 2004/04/18 01:29:52 hno Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -421,7 +421,7 @@ /* decode the username */ /* trim BASIC from string */ - while (!xisspace(*proxy_auth)) + while (xisgraph(*proxy_auth)) proxy_auth++; local_basic.passwd = NULL; Index: squid/src/auth/digest/Makefile.in diff -u squid/src/auth/digest/Makefile.in:1.6.2.6 squid/src/auth/digest/Makefile.in:1.6.2.7 --- squid/src/auth/digest/Makefile.in:1.6.2.6 Tue Feb 11 19:03:20 2003 +++ squid/src/auth/digest/Makefile.in Sat Mar 6 18:11:39 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/auth/digest/auth_digest.c diff -u squid/src/auth/digest/auth_digest.c:1.10.2.11 squid/src/auth/digest/auth_digest.c:1.10.2.12 --- squid/src/auth/digest/auth_digest.c:1.10.2.11 Thu Feb 19 05:28:01 2004 +++ squid/src/auth/digest/auth_digest.c Sat Apr 17 19:29:52 2004 @@ -1,6 +1,6 @@ /* - * $Id: auth_digest.c,v 1.10.2.11 2004/02/19 12:28:01 hno Exp $ + * $Id: auth_digest.c,v 1.10.2.12 2004/04/18 01:29:52 hno Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins @@ -764,7 +764,8 @@ authenticateDigestDirection(auth_user_request_t * auth_user_request) { digest_request_h *digest_request = auth_user_request->scheme_data; - /* null auth_user is checked for by authenticateDirection */ + if (!digest_request) + return -2; switch (digest_request->flags.credentials_ok) { case 0: /* not checked */ return -1; @@ -790,6 +791,8 @@ if (!auth_user_request) return; digest_request = auth_user_request->scheme_data; + if (!digest_request) + return; /* don't add to authentication error pages */ if ((!accel && rep->sline.status == HTTP_PROXY_AUTHENTICATION_REQUIRED) || (accel && rep->sline.status == HTTP_UNAUTHORIZED)) @@ -1136,7 +1139,7 @@ digest_request = authDigestRequestNew(); /* trim DIGEST from string */ - while (!xisspace(*proxy_auth)) + while (xisgraph(*proxy_auth)) proxy_auth++; /* Trim leading whitespace before decoding */ Index: squid/src/auth/ntlm/Makefile.in diff -u squid/src/auth/ntlm/Makefile.in:1.6.2.6 squid/src/auth/ntlm/Makefile.in:1.6.2.7 --- squid/src/auth/ntlm/Makefile.in:1.6.2.6 Tue Feb 11 19:03:22 2003 +++ squid/src/auth/ntlm/Makefile.in Sat Mar 6 18:11:39 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/auth/ntlm/auth_ntlm.c diff -u squid/src/auth/ntlm/auth_ntlm.c:1.17.2.9 squid/src/auth/ntlm/auth_ntlm.c:1.17.2.12 --- squid/src/auth/ntlm/auth_ntlm.c:1.17.2.9 Tue Feb 24 10:11:52 2004 +++ squid/src/auth/ntlm/auth_ntlm.c Sat Apr 17 19:29:52 2004 @@ -1,6 +1,6 @@ /* - * $Id: auth_ntlm.c,v 1.17.2.9 2004/02/24 17:11:52 hno Exp $ + * $Id: auth_ntlm.c,v 1.17.2.12 2004/04/18 01:29:52 hno Exp $ * * DEBUG: section 29 NTLM Authenticator * AUTHOR: Robert Collins @@ -481,7 +481,6 @@ debug(29, 2) ("AuthenticateNTLMHandleReply: invalid callback data. Releasing helper '%p'.\n", srv); cbdataUnlock(r->data); authenticateStateFree(r); - helperStatefulReleaseServer(srv); return; } if (!reply) { @@ -657,7 +656,7 @@ assert(ntlm_request); assert(handler); assert(data); - assert(auth_user->auth_type = AUTH_NTLM); + assert(auth_user->auth_type == AUTH_NTLM); debug(29, 9) ("authenticateNTLMStart: auth state '%d'\n", ntlm_request->auth_state); switch (ntlm_request->auth_state) { case AUTHENTICATE_STATE_NEGOTIATE: @@ -672,7 +671,7 @@ fatal("Invalid authenticate state for NTLMStart"); } - while (!xisspace(*sent_string)) /*trim NTLM */ + while (xisgraph(*sent_string)) /*trim NTLM */ sent_string++; while (xisspace(*sent_string)) /*trim leading spaces */ Index: squid/src/fs/Makefile.in diff -u squid/src/fs/Makefile.in:1.8.2.6 squid/src/fs/Makefile.in:1.8.2.7 --- squid/src/fs/Makefile.in:1.8.2.6 Tue Feb 11 19:03:24 2003 +++ squid/src/fs/Makefile.in Sat Mar 6 18:11:40 2004 @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.8.2.6 2003/02/12 02:03:24 hno Exp $ +# $Id: Makefile.in,v 1.8.2.7 2004/03/07 01:11:40 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/fs/aufs/Makefile.in diff -u squid/src/fs/aufs/Makefile.in:1.8.2.5 squid/src/fs/aufs/Makefile.in:1.8.2.6 --- squid/src/fs/aufs/Makefile.in:1.8.2.5 Tue Feb 11 19:03:26 2003 +++ squid/src/fs/aufs/Makefile.in Sat Mar 6 18:11:41 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/fs/coss/Makefile.in diff -u squid/src/fs/coss/Makefile.in:1.8.2.5 squid/src/fs/coss/Makefile.in:1.8.2.6 --- squid/src/fs/coss/Makefile.in:1.8.2.5 Tue Feb 11 19:03:27 2003 +++ squid/src/fs/coss/Makefile.in Sat Mar 6 18:11:41 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/fs/diskd/Makefile.in diff -u squid/src/fs/diskd/Makefile.in:1.6.2.5 squid/src/fs/diskd/Makefile.in:1.6.2.6 --- squid/src/fs/diskd/Makefile.in:1.6.2.5 Tue Feb 11 19:03:32 2003 +++ squid/src/fs/diskd/Makefile.in Sat Mar 6 18:11:41 2004 @@ -16,7 +16,7 @@ # # Makefile for the DISKD storage driver for the Squid Object Cache server # -# $Id: Makefile.in,v 1.6.2.5 2003/02/12 02:03:32 hno Exp $ +# $Id: Makefile.in,v 1.6.2.6 2004/03/07 01:11:41 hno Exp $ # SHELL = @SHELL@ @@ -95,6 +95,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/fs/null/Makefile.in diff -u squid/src/fs/null/Makefile.in:1.7.2.5 squid/src/fs/null/Makefile.in:1.7.2.6 --- squid/src/fs/null/Makefile.in:1.7.2.5 Tue Feb 11 19:03:32 2003 +++ squid/src/fs/null/Makefile.in Sat Mar 6 18:11:41 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/fs/ufs/Makefile.in diff -u squid/src/fs/ufs/Makefile.in:1.6.2.5 squid/src/fs/ufs/Makefile.in:1.6.2.6 --- squid/src/fs/ufs/Makefile.in:1.6.2.5 Tue Feb 11 19:03:33 2003 +++ squid/src/fs/ufs/Makefile.in Sat Mar 6 18:11:41 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/repl/Makefile.in diff -u squid/src/repl/Makefile.in:1.7.2.6 squid/src/repl/Makefile.in:1.7.2.7 --- squid/src/repl/Makefile.in:1.7.2.6 Tue Feb 11 19:03:38 2003 +++ squid/src/repl/Makefile.in Sat Mar 6 18:11:42 2004 @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.6 2003/02/12 02:03:38 hno Exp $ +# $Id: Makefile.in,v 1.7.2.7 2004/03/07 01:11:42 hno Exp $ # SHELL = @SHELL@ @@ -94,6 +94,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/repl/heap/Makefile.in diff -u squid/src/repl/heap/Makefile.in:1.6.2.5 squid/src/repl/heap/Makefile.in:1.6.2.6 --- squid/src/repl/heap/Makefile.in:1.6.2.5 Tue Feb 11 19:03:39 2003 +++ squid/src/repl/heap/Makefile.in Sat Mar 6 18:11:42 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@ Index: squid/src/repl/lru/Makefile.in diff -u squid/src/repl/lru/Makefile.in:1.6.2.5 squid/src/repl/lru/Makefile.in:1.6.2.6 --- squid/src/repl/lru/Makefile.in:1.6.2.5 Tue Feb 11 19:03:42 2003 +++ squid/src/repl/lru/Makefile.in Sat Mar 6 18:11:42 2004 @@ -89,6 +89,7 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ +PKGCONFIG = @PKGCONFIG@ RANLIB = @RANLIB@ REGEXLIB = @REGEXLIB@ REPL_LIBS = @REPL_LIBS@