>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
cat >>$CONFIG_STATUS <<\_ACEOF
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated by configure. */" >$tmp/config.h
- else
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
if test x"$ac_file" != x-; then
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
rm -f $ac_file
- mv $tmp/config.h $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- cat $tmp/config.h
- rm -f $tmp/config.h
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
+ rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
@@ -27778,135 +28185,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
- ac_builddir=.
-
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
- case $ac_dest in
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
@@ -27916,18 +28227,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`(dirname "$mf") 2>/dev/null ||
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
else
continue
fi
@@ -27949,53 +28271,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
- fdir=`(dirname "$file") 2>/dev/null ||
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p $dirpart/$fdir
- else
- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
;;
+
esac
-done
-_ACEOF
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
_ACEOF
diff -ruN squid-2.6.STABLE14/configure.in squid-2.6.STABLE15/configure.in
--- squid-2.6.STABLE14/configure.in Sun Jul 15 08:21:59 2007
+++ squid-2.6.STABLE15/configure.in Fri Aug 31 08:55:13 2007
@@ -1,16 +1,16 @@
dnl
dnl Configuration input file for Squid
dnl
-dnl $Id: configure.in,v 1.416.2.17 2007/07/15 14:11:57 hno Exp $
+dnl $Id: configure.in,v 1.416.2.18 2007/08/31 14:48:33 hno Exp $
dnl
dnl
dnl
-AC_INIT(Squid Web Proxy, 2.6.STABLE14, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.6.STABLE15, http://www.squid-cache.org/bugs/, squid)
AC_PREREQ(2.52)
AM_CONFIG_HEADER(include/autoconf.h)
AC_CONFIG_AUX_DIR(cfgaux)
AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.416.2.17 $)dnl
+AC_REVISION($Revision: 1.416.2.18 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
diff -ruN squid-2.6.STABLE14/contrib/Makefile.in squid-2.6.STABLE15/contrib/Makefile.in
--- squid-2.6.STABLE14/contrib/Makefile.in Fri Jun 22 18:14:35 2007
+++ squid-2.6.STABLE15/contrib/Makefile.in Sun Aug 12 06:40:46 2007
@@ -102,6 +102,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -194,8 +195,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -210,24 +209,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/doc/Makefile.in squid-2.6.STABLE15/doc/Makefile.in
--- squid-2.6.STABLE14/doc/Makefile.in Fri Jun 22 18:14:36 2007
+++ squid-2.6.STABLE15/doc/Makefile.in Sun Aug 12 06:40:46 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.32.2.1 2007/06/23 00:14:36 hno Exp $
+# $Id: Makefile.in,v 1.32.2.2 2007/08/12 12:40:46 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -109,6 +109,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -201,8 +202,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -217,24 +216,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_ACCESS_DENIED squid-2.6.STABLE15/errors/Armenian/ERR_ACCESS_DENIED
--- squid-2.6.STABLE14/errors/Armenian/ERR_ACCESS_DENIED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_ACCESS_DENIED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,24 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+ URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+Ձեր քեշի կառավարիչը %w է․
+
+
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_CACHE_ACCESS_DENIED squid-2.6.STABLE15/errors/Armenian/ERR_CACHE_ACCESS_DENIED
--- squid-2.6.STABLE14/errors/Armenian/ERR_CACHE_ACCESS_DENIED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_CACHE_ACCESS_DENIED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,34 @@
+
+
+ՍԽԱԼ: Մուտքը քեշին արգելված է
+
+
+
+ՍԽԱԼ
+Մուտքը քեշին արգելված է
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Մուտքը քեշին արգելված է.
+
+
+
+
+Ներողություն,Դուք չեք կարող կատարել հետևյալ հարցումը:
+
%U
+մինչև աութենտիֆիկացիան չանցնեք.
+
+
+
+Դրա համար Ձեզ անհրաժեշտ է Netscape 2.0 կամ ավելի նոր տարբերակ,կամ Microsoft Internet
+Explorer 3.0, կամ HTTP/1.1 համատեղելի բրաուզեր.
+Խնդիրներ առաջանալու դեպքում խնդրվում է դիմել
+քեշի կառավարիչին կամ
+փոխել Ձեր ընթացիկ գաղտնաբառը.
+
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED squid-2.6.STABLE15/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-2.6.STABLE14/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,30 @@
+
+
+Սխալ: Քեշի կառավառման մուտքն արգելված է
+
+
+
+ՍԽԱԼ
+Քեշի կառավառման մուտքն արգելված է
+
+
+URL ի առաքման ժամանակ.
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Քեշի կառավառման մուտքն արգելված է.
+
+
+
+
+Ներողություն,Դուք չեք կարող քեշի կառավարման համակարգից կատարել հետևյալ հարցումը:
+
%U
+մինչև աութենտիֆիկացիան չանցնեք.
+
+
+ Դրա համար Ձեզ անհրաժեշտ է Netscape 2.0 կամ ավելի նոր տարբերակ,կամ Microsoft Internet
+Explorer 3.0, կամ HTTP/1.1 համատեղելի բրաուզեր. Աութենտիֆիկացիայի հետ խնդիրներ առաջանալու դեպքում խնդրվում է դիմել
+քեշի կառավարիչին.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_CANNOT_FORWARD squid-2.6.STABLE15/errors/Armenian/ERR_CANNOT_FORWARD
--- squid-2.6.STABLE14/errors/Armenian/ERR_CANNOT_FORWARD Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_CANNOT_FORWARD Tue Aug 21 18:20:52 2007
@@ -0,0 +1,28 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Հնարավոր չէ վերահասցեագրել Ձեր հարցումը տվյալ պահին.
+
+
+
+
+Այս հարցումը հնարավոր չէ վերահասցեագրել սկզբնաղբյուր սերվերին կամ ծնողական քեշերից որևէ մեկին․Սխալի ամենահավանական պատճառներն են :
+
+- Այս սերվերի կառավարիչը արգելել է բոլոր ուղիղ միացումները սկզբնաղբյուր սերվերների հետ
+
+
- Բոլոր ծնողական քեշերը տվյալ պահին անհասանելի են.
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_CONNECT_FAIL squid-2.6.STABLE15/errors/Armenian/ERR_CONNECT_FAIL
--- squid-2.6.STABLE14/errors/Armenian/ERR_CONNECT_FAIL Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_CONNECT_FAIL Tue Aug 21 18:20:52 2007
@@ -0,0 +1,27 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Չհաջողվեց կապ հաստատել
+
+
+
+
+Ստացված պատասխանը:
+
%E
+
+
+Հեռակա հանգույցը կամ ցանցը չեն պատասխանում. Խնդրվում է կրկնել հարցումը.
+
Ձեր քեշի կառավարիչը %w. է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_DNS_FAIL squid-2.6.STABLE15/errors/Armenian/ERR_DNS_FAIL
--- squid-2.6.STABLE14/errors/Armenian/ERR_DNS_FAIL Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_DNS_FAIL Tue Aug 21 18:20:52 2007
@@ -0,0 +1,30 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+Անհնար է որոշել
+%H հանգույցի IP հասցեն.
+
+
+
+DNS սերվերի պատասխանը:
+
+%z
+
+
+
+Սա նշանակում է:
+
+ Քեշը ի վիճակի չէ որոշել URL ում նշված սերվերի հասցեն.
+Ստուգեք հասցեի ներմուծման ճշտությունը.
+
+Ձեր քեշի կառավարիչը %w. է
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FORWARDING_DENIED squid-2.6.STABLE15/errors/Armenian/ERR_FORWARDING_DENIED
--- squid-2.6.STABLE14/errors/Armenian/ERR_FORWARDING_DENIED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FORWARDING_DENIED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Վերահասցեագրումն արգելված է.
+
+
+
+
+Այս քեշը անկարող է վերահասցեագրել Ձեր հարցումը sibling տիպի փոխհարաբերություններ հաստատելու պատճառով. Հավանական է,որ %i -ն սխալ սարքաբերված քեշ է.
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_DISABLED squid-2.6.STABLE15/errors/Armenian/ERR_FTP_DISABLED
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_DISABLED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_DISABLED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,22 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+FTP արձանագրությունն արգելված է
+
+
+
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_FAILURE squid-2.6.STABLE15/errors/Armenian/ERR_FTP_FAILURE
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_FAILURE Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_FAILURE Tue Aug 21 18:20:52 2007
@@ -0,0 +1,18 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ տեղի ունեցավ FTP արձանագրության սխալ:
+%U
+
+Squid-ը ուղարկեց հետևյալ FTP հրամանը:
+
%f
+և ստացավ այս պատասխանը
+%F
+%g
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_FORBIDDEN squid-2.6.STABLE15/errors/Armenian/ERR_FTP_FORBIDDEN
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_FORBIDDEN Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_FORBIDDEN Tue Aug 21 18:20:52 2007
@@ -0,0 +1,18 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ տեղի ունեցավ FTP աութենտիֆիկացիայի սխալ:
+%U
+
+Squid-ը ուղարկեց հետևյալ FTP հրամանը:
+
%f
+և ստացավ այս պատասխանը
+%F
+%g
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_NOT_FOUND squid-2.6.STABLE15/errors/Armenian/ERR_FTP_NOT_FOUND
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_NOT_FOUND Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_NOT_FOUND Tue Aug 21 18:20:52 2007
@@ -0,0 +1,21 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+Հետևյալ URL չի կարող առաքվել:
+%U
+
+Squid-ը ուղարկեց հետևյալ FTP հրամանը:
+
%f
+և ստացավ այս պատասխանը
+%F
+%g
+
+Սա կարող է լինել FTP URL -ի բացարձակ ուղղով հարցման արդյունք (ինչը չի համապատասխանում RFC 1738-ին). Եթե սա է սխալի պատճառը,ապա ֆայլը կարող է գնտվել այստեղ
+ %B.
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_CREATED squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_CREATED
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_CREATED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_CREATED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,8 @@
+
+
+FTP PUT Գործողությունը հաջողվեց: Ֆայլը ստեղծված է
+
+
+Գործողությունը հաջողվեց
+Ֆայլը ստեղծված է
+
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_ERROR squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_ERROR
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_ERROR Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_ERROR Tue Aug 21 18:20:52 2007
@@ -0,0 +1,26 @@
+
+
+ՍԽԱԼ: FTP upload գործողությունը խափանվեց
+
+
+ՍԽԱԼ
+FTP upload գործողությունը խափանվեց
+
+
+%U URL-ի PUT գործողության իրականացման ժամանակ
+տեղի ունեցավ սխալ:
+
+Squid-ը ուղարկեց հետևյալ FTP հրամանը:
+
+ %f
+
+և ստացավ այս պատասխանը
+
+ %F
+
+
+Սա նշանակում է:
+
Ստուգեք ուղին,մուտքի իրավունքները,ֆայլային տարածությունը և կրկին փորձեք.
+
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_MODIFIED squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_MODIFIED
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_PUT_MODIFIED Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_PUT_MODIFIED Tue Aug 21 18:20:52 2007
@@ -0,0 +1,8 @@
+
+
+FTP PUT գործողությունը հաջողվեց: Ֆայլը թարմացված է
+
+
+Գործողությունը հաջողվեց
+Ֆայլը թարմացված է
+
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_FTP_UNAVAILABLE squid-2.6.STABLE15/errors/Armenian/ERR_FTP_UNAVAILABLE
--- squid-2.6.STABLE14/errors/Armenian/ERR_FTP_UNAVAILABLE Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_FTP_UNAVAILABLE Tue Aug 21 18:20:52 2007
@@ -0,0 +1,17 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+%U URL-ի առաքման ժամանակ FTP սերվերը շատ զբաղված էր:
+
+Squid-ը ուղարկեց հետևյալ FTP հրամանը:
+
%f
+և ստացավ այս պատասխանը
+%F
+%g
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_REQ squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_REQ
--- squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_REQ Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_REQ Tue Aug 21 18:20:52 2007
@@ -0,0 +1,33 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+Հարցման մշակման ընթացքում:
+
+%R
+
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+HTTP հարցման որոշ ասպեկտներ սխալ են. Հնարավոր պատճառներն են:
+
+- Հարցման մեթոդը բացակայում է կամ անհայտ է
+
- URL -ն բացակայում է
+
- HTTP իդենտիֆիկատորը բացակայում է (HTTP/1.0)
+
- Հարցման ծավալը շատ մեծ է
+
- POST կամ PUT հարցումների համար Content-Length չի նշված
+
- Անթույլատրելի նիշ սերվերի անվան մեջ;ընդգծման նիշն անթույլատրելի է
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_RESP squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_RESP
--- squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_RESP Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_RESP Tue Aug 21 18:20:52 2007
@@ -0,0 +1,27 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+Հարցման մշակման ընթացքում
+
+%R
+
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+Սերվերից ստացվող պատասխանն անհասկանալի է կամ այլայլված․Դիմեք տվյալ կայքի կառավարիչներին։
+Ձեր քեշի կառավարիչը անհրաժեշտության դեպքում կարող է ավելի մանրակրկիտ նկարագրել խնդրի բնւյթը.
+
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_URL squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_URL
--- squid-2.6.STABLE14/errors/Armenian/ERR_INVALID_URL Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_INVALID_URL Tue Aug 21 18:20:52 2007
@@ -0,0 +1,29 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+URL-ի որոշ ասպեկտներ սխալ են.Հնարավոր պատճառներն են:
+
+- Մուտքային արձանագրությունը սխալ է կամ բացակայում է (պետք է լինի `http://'' կամ նման)
+
- Հանգույցի անունը բացակայում է
+
- Անթույլատրելի կրկնակի կառավարող նիշ URL ուղղում
+
- Անթույլատրելի նիշ հանգույցի անվան մեջ;ընդգծման նիշը անթույլատրելի է
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_LIFETIME_EXP squid-2.6.STABLE15/errors/Armenian/ERR_LIFETIME_EXP
--- squid-2.6.STABLE14/errors/Armenian/ERR_LIFETIME_EXP Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_LIFETIME_EXP Tue Aug 21 18:20:52 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Կապ հաստատման ժամանակը սպառվեց
+
+
+
+
+Squid-ը ընդհատեց հարցումը կապ հաստատման առավելագույն ժամանակը գերազանցելու պատճառով․.
+
Ձեր քեշի կառավարիչը %w է․
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_NO_RELAY squid-2.6.STABLE15/errors/Armenian/ERR_NO_RELAY
--- squid-2.6.STABLE14/errors/Armenian/ERR_NO_RELAY Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_NO_RELAY Tue Aug 21 18:20:52 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Wais Relay որոշված չէ
+
+
+
+
+Այս քեշի համար WAIS Relay որոշված չէ! Հայտնեք կառավարիչին.
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_ONLY_IF_CACHED_MISS squid-2.6.STABLE15/errors/Armenian/ERR_ONLY_IF_CACHED_MISS
--- squid-2.6.STABLE14/errors/Armenian/ERR_ONLY_IF_CACHED_MISS Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_ONLY_IF_CACHED_MISS Tue Aug 21 18:20:53 2007
@@ -0,0 +1,26 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Օբյեկտը քեշում գտնված չէ; ձևավորվեց
only-if-cached դիրեկտիվը.
+
+
+
+
+
+Դուք հարցում եք հղել only-if-cached քեշի կառավարման դիրեկտիվով
+.
+
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_READ_ERROR squid-2.6.STABLE15/errors/Armenian/ERR_READ_ERROR
--- squid-2.6.STABLE14/errors/Armenian/ERR_READ_ERROR Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_READ_ERROR Tue Aug 21 18:20:53 2007
@@ -0,0 +1,27 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+Համակարգը հայտնեց:
+
%E
+
+
+Ցանցից տվյալների ընթերցման ժամանակ առաջացավ սխալ.Խնդրվում է կրկնել հարցումը.
+
Ձեր քեշի կառավարիչը %w է․
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_READ_TIMEOUT squid-2.6.STABLE15/errors/Armenian/ERR_READ_TIMEOUT
--- squid-2.6.STABLE14/errors/Armenian/ERR_READ_TIMEOUT Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_READ_TIMEOUT Tue Aug 21 18:20:53 2007
@@ -0,0 +1,28 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Պատասխան սպասելու առավելագույն ժամանակը գերազանցված է
+
+
+
+
+Համակարգը հայտնեց:
+
%E
+
+
+Ցանցից տվյալների ընթերցման ընթացքում սպասման առավելագույն ժամանակը գերազանցվեց․
+Ցանցը կամ հանգույցը չեն աշխատում կամ գերբեռնված են։ Խնդրվում է կրկնել հարցումը
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_SHUTTING_DOWN squid-2.6.STABLE15/errors/Armenian/ERR_SHUTTING_DOWN
--- squid-2.6.STABLE14/errors/Armenian/ERR_SHUTTING_DOWN Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_SHUTTING_DOWN Tue Aug 21 18:20:53 2007
@@ -0,0 +1,16 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+Այս քեշը տվյալ պահին գտնվում է անջատման պրոցեսում և չի կարող սպասարկել Ձեր հարցումը․Կրկնեք հարցումը որոշ ժամանակ անց․
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_SOCKET_FAILURE squid-2.6.STABLE15/errors/Armenian/ERR_SOCKET_FAILURE
--- squid-2.6.STABLE14/errors/Armenian/ERR_SOCKET_FAILURE Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_SOCKET_FAILURE Tue Aug 21 18:20:53 2007
@@ -0,0 +1,27 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+Համակարգը հայտնեց:
+
%E
+
+
+Squid-ը չի կարող ստեղծել Tcp Socket, հավանաբար գերբեռնվածության պատճառով․Խնդրվում է կրկնել հարցումը․ Եթե իրավիճակը կրկնվի, դիմեք քեշի կառավարիչին․
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_TOO_BIG squid-2.6.STABLE15/errors/Armenian/ERR_TOO_BIG
--- squid-2.6.STABLE14/errors/Armenian/ERR_TOO_BIG Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_TOO_BIG Tue Aug 21 18:20:53 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Հարցումը կամ պատասխանը շատ մեծ ծավալ ունեն.
+
+
+
+
+
+Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_UNSUP_REQ squid-2.6.STABLE15/errors/Armenian/ERR_UNSUP_REQ
--- squid-2.6.STABLE14/errors/Armenian/ERR_UNSUP_REQ Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_UNSUP_REQ Tue Aug 21 18:20:53 2007
@@ -0,0 +1,25 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+-
+
+Չուղեկցվող մեթոդ և հարցման արձանագրություն
+
+
+
+
+Squid-ը բոլոր արձանագրությունների համար բոլոր հարցման մեթոդները չի ուղեկցում .
+Օրինակ,Gopher արձանագրության համար չեք կարող POST հարցում կատարել.
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_URN_RESOLVE squid-2.6.STABLE15/errors/Armenian/ERR_URN_RESOLVE
--- squid-2.6.STABLE14/errors/Armenian/ERR_URN_RESOLVE Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_URN_RESOLVE Tue Aug 21 18:20:53 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URN չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URN չի կարող առաքվել
+
+
+URN ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Cannot Resolve URN
+
+
+
+
+Չարժե շատ բան սպասել URN-ից %T -ի վրա :)
+
Ձեր քեշի կառավարիչը %w է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_WRITE_ERROR squid-2.6.STABLE15/errors/Armenian/ERR_WRITE_ERROR
--- squid-2.6.STABLE14/errors/Armenian/ERR_WRITE_ERROR Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_WRITE_ERROR Tue Aug 21 18:20:53 2007
@@ -0,0 +1,28 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+
+
+Համակարգը պատասխանեց:
+
%E
+
+
+Տվյալները ցանց ուղարկելու ժամանակ առաջացավ սխալ․ Խնդրվում է կրկնել հարցումը․
+
Ձեր քեշի կառավարիչը %w է.
+
diff -ruN squid-2.6.STABLE14/errors/Armenian/ERR_ZERO_SIZE_OBJECT squid-2.6.STABLE15/errors/Armenian/ERR_ZERO_SIZE_OBJECT
--- squid-2.6.STABLE14/errors/Armenian/ERR_ZERO_SIZE_OBJECT Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/ERR_ZERO_SIZE_OBJECT Tue Aug 21 18:20:53 2007
@@ -0,0 +1,23 @@
+
+
+ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
+
+
+ՍԽԱԼ
+Պահանջվող URL չի կարող առաքվել
+
+
+URL ի առաքման ժամանակ:
+%U
+
+Տեղի ունեցավ հետևյալ սխալը:
+
+-
+
+Զրոյական երկարությամբ պատասխան
+
+
+
+
+Քեշը ի պատասխան այս հարցումի ոչ մի տվյալ չի ստացել.
+
Ձեր քեշի կառավարիչը %w. է.
diff -ruN squid-2.6.STABLE14/errors/Armenian/README squid-2.6.STABLE15/errors/Armenian/README
--- squid-2.6.STABLE14/errors/Armenian/README Wed Dec 31 17:00:00 1969
+++ squid-2.6.STABLE15/errors/Armenian/README Tue Aug 21 18:20:53 2007
@@ -0,0 +1,2 @@
+Thank you to Arthur Tumanyan for
+creating these error pages in Armenian!
diff -ruN squid-2.6.STABLE14/errors/Makefile.am squid-2.6.STABLE15/errors/Makefile.am
--- squid-2.6.STABLE14/errors/Makefile.am Fri Apr 28 04:17:15 2006
+++ squid-2.6.STABLE15/errors/Makefile.am Tue Aug 21 18:20:52 2007
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
#
-# $Id: Makefile.am,v 1.12 2006/04/28 10:17:15 hno Exp $
+# $Id: Makefile.am,v 1.12.2.1 2007/08/22 00:20:52 hno Exp $
#
errordir = $(datadir)/errors
@@ -12,6 +12,7 @@
INSTALL_LANGUAGES = @ERR_LANGUAGES@
LANGUAGES = \
+ Armenian \
Azerbaijani \
Bulgarian \
Catalan \
diff -ruN squid-2.6.STABLE14/errors/Makefile.in squid-2.6.STABLE15/errors/Makefile.in
--- squid-2.6.STABLE14/errors/Makefile.in Fri Jun 22 18:14:40 2007
+++ squid-2.6.STABLE15/errors/Makefile.in Wed Aug 22 18:14:40 2007
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.in,v 1.48.2.1 2007/06/23 00:14:40 hno Exp $
+# $Id: Makefile.in,v 1.48.2.3 2007/08/23 00:14:40 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -101,6 +101,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -193,8 +194,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -209,24 +208,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -235,6 +241,7 @@
DEFAULT_ERROR_DIR = $(errordir)
INSTALL_LANGUAGES = @ERR_LANGUAGES@
LANGUAGES = \
+ Armenian \
Azerbaijani \
Bulgarian \
Catalan \
diff -ruN squid-2.6.STABLE14/helpers/Makefile.in squid-2.6.STABLE15/helpers/Makefile.in
--- squid-2.6.STABLE14/helpers/Makefile.in Fri Jun 22 18:14:41 2007
+++ squid-2.6.STABLE15/helpers/Makefile.in Sun Aug 12 06:40:47 2007
@@ -106,6 +106,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -198,8 +199,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -214,24 +213,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/DB/Makefile.am squid-2.6.STABLE15/helpers/basic_auth/DB/Makefile.am
--- squid-2.6.STABLE14/helpers/basic_auth/DB/Makefile.am Sat Jun 23 15:30:26 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/DB/Makefile.am Sat Jul 21 15:16:56 2007
@@ -1,13 +1,13 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.am,v 1.1.2.2 2007/06/23 21:30:26 hno Exp $
+# $Id: Makefile.am,v 1.1.2.3 2007/07/21 21:16:56 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
libexec_SCRIPTS = squid_db_auth
-CLEANFILES = squid_db_auth
+CLEANFILES = squid_db_auth squid_db_auth.8
do_subst = sed -e 's,[@]PERL[@],$(PERL),g'
man_MANS = squid_db_auth.8
EXTRA_DIST = passwd.sql \
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/DB/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/DB/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/DB/Makefile.in Sat Jun 23 15:51:52 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/DB/Makefile.in Sun Aug 12 06:40:48 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.2.4 2007/06/23 21:51:52 hno Exp $
+# $Id: Makefile.in,v 1.1.2.6 2007/08/12 12:40:48 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -112,6 +112,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -204,8 +205,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -220,30 +219,37 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
libexec_SCRIPTS = squid_db_auth
-CLEANFILES = squid_db_auth
+CLEANFILES = squid_db_auth squid_db_auth.8
do_subst = sed -e 's,[@]PERL[@],$(PERL),g'
man_MANS = squid_db_auth.8
EXTRA_DIST = passwd.sql \
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/DB/squid_db_auth.in squid-2.6.STABLE15/helpers/basic_auth/DB/squid_db_auth.in
--- squid-2.6.STABLE14/helpers/basic_auth/DB/squid_db_auth.in Sat Jun 23 15:30:26 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/DB/squid_db_auth.in Fri Aug 31 07:47:03 2007
@@ -3,6 +3,7 @@
use DBI;
use Getopt::Long;
use Pod::Usage;
+$|=1;
=pod
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/LDAP/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/LDAP/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/LDAP/Makefile.in Fri Jun 22 18:14:44 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/LDAP/Makefile.in Sun Aug 12 06:40:48 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid LDAP authentication helper
#
-# $Id: Makefile.in,v 1.40.2.1 2007/06/23 00:14:44 hno Exp $
+# $Id: Makefile.in,v 1.40.2.2 2007/08/12 12:40:48 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -128,6 +128,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -220,8 +221,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -236,24 +235,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/LDAP/squid_ldap_auth.c squid-2.6.STABLE15/helpers/basic_auth/LDAP/squid_ldap_auth.c
--- squid-2.6.STABLE14/helpers/basic_auth/LDAP/squid_ldap_auth.c Mon Jun 25 17:37:59 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/LDAP/squid_ldap_auth.c Fri Aug 31 08:17:11 2007
@@ -342,7 +342,7 @@
int
main(int argc, char **argv)
{
- char buf[256];
+ char buf[1024];
char *user, *passwd;
char *ldapServer = NULL;
LDAP *ld = NULL;
@@ -565,7 +565,7 @@
}
#endif
- while (fgets(buf, 256, stdin) != NULL) {
+ while (fgets(buf, sizeof(buf), stdin) != NULL) {
user = strtok(buf, " \r\n");
passwd = strtok(NULL, "\r\n");
@@ -638,7 +638,7 @@
static int
checkLDAP(LDAP * persistent_ld, const char *userid, const char *password, const char *ldapServer, int port)
{
- char dn[256];
+ char dn[1024];
int ret = 0;
LDAP *bind_ld = NULL;
@@ -651,12 +651,12 @@
return 1;
}
if (searchfilter) {
- char filter[256];
- char escaped_login[256];
+ char filter[16384];
+ char escaped_login[1024];
LDAPMessage *res = NULL;
LDAPMessage *entry;
char *searchattr[] =
- {LDAP_NO_ATTRS, NULL};
+ {(char *)LDAP_NO_ATTRS, NULL};
char *userdn;
int rc;
LDAP *search_ld = persistent_ld;
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/MSNT/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/MSNT/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/MSNT/Makefile.in Fri Jun 22 18:14:44 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/MSNT/Makefile.in Sun Aug 12 06:40:48 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.43.2.1 2007/06/23 00:14:44 hno Exp $
+# $Id: Makefile.in,v 1.43.2.2 2007/08/12 12:40:48 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -137,6 +137,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -229,8 +230,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -245,24 +244,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/Makefile.in Mon Jun 25 18:14:18 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/Makefile.in Sun Aug 12 06:40:47 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.39.2.3 2007/06/26 00:14:18 hno Exp $
+# $Id: Makefile.in,v 1.39.2.4 2007/08/12 12:40:47 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/NCSA/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/NCSA/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/NCSA/Makefile.in Fri Jun 22 18:14:44 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/NCSA/Makefile.in Sun Aug 12 06:40:48 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.40.2.1 2007/06/23 00:14:44 hno Exp $
+# $Id: Makefile.in,v 1.40.2.2 2007/08/12 12:40:48 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -128,6 +128,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -220,8 +221,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -236,24 +235,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/PAM/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/PAM/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/PAM/Makefile.in Fri Jun 22 18:14:44 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/PAM/Makefile.in Sun Aug 12 06:40:49 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid PAM authentication helper
#
-# $Id: Makefile.in,v 1.39.2.1 2007/06/23 00:14:44 hno Exp $
+# $Id: Makefile.in,v 1.39.2.2 2007/08/12 12:40:49 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -127,6 +127,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,8 +220,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -235,24 +234,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/POP3/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/POP3/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/POP3/Makefile.in Mon Jun 25 18:14:19 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/POP3/Makefile.in Sun Aug 12 06:40:50 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.2.2 2007/06/26 00:14:19 hno Exp $
+# $Id: Makefile.in,v 1.1.2.3 2007/08/12 12:40:50 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -109,6 +109,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -201,8 +202,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -217,24 +216,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/SASL/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/SASL/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/SASL/Makefile.in Fri Jun 22 18:14:45 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/SASL/Makefile.in Sun Aug 12 06:40:50 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid SASL authentication helper
#
-# $Id: Makefile.in,v 1.36.2.1 2007/06/23 00:14:45 hno Exp $
+# $Id: Makefile.in,v 1.36.2.2 2007/08/12 12:40:50 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -124,6 +124,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -216,8 +217,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -232,24 +231,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/SMB/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/SMB/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/SMB/Makefile.in Fri Jun 22 18:14:46 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/SMB/Makefile.in Sun Aug 12 06:40:50 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.39.2.1 2007/06/23 00:14:46 hno Exp $
+# $Id: Makefile.in,v 1.39.2.2 2007/08/12 12:40:50 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -133,6 +133,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -225,8 +226,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -241,24 +240,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/YP/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/YP/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/YP/Makefile.in Fri Jun 22 18:14:46 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/YP/Makefile.in Sun Aug 12 06:40:51 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.40.2.1 2007/06/23 00:14:46 hno Exp $
+# $Id: Makefile.in,v 1.40.2.2 2007/08/12 12:40:51 hno Exp $
#
#
@@ -123,6 +123,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -215,8 +216,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -231,24 +230,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/getpwnam/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/getpwnam/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/getpwnam/Makefile.in Fri Jun 22 18:14:46 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/getpwnam/Makefile.in Sun Aug 12 06:40:51 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.38.2.1 2007/06/23 00:14:46 hno Exp $
+# $Id: Makefile.in,v 1.38.2.2 2007/08/12 12:40:51 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -125,6 +125,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -217,8 +218,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -233,24 +232,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/mswin_sspi/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/mswin_sspi/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/mswin_sspi/Makefile.in Fri Jun 22 18:14:46 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/mswin_sspi/Makefile.in Sun Aug 12 06:40:53 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.12.2.1 2007/06/23 00:14:46 hno Exp $
+# $Id: Makefile.in,v 1.12.2.2 2007/08/12 12:40:53 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -124,6 +124,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -216,8 +217,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -232,24 +231,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/basic_auth/multi-domain-NTLM/Makefile.in squid-2.6.STABLE15/helpers/basic_auth/multi-domain-NTLM/Makefile.in
--- squid-2.6.STABLE14/helpers/basic_auth/multi-domain-NTLM/Makefile.in Fri Jun 22 18:14:47 2007
+++ squid-2.6.STABLE15/helpers/basic_auth/multi-domain-NTLM/Makefile.in Sun Aug 12 06:40:53 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.36.2.1 2007/06/23 00:14:47 hno Exp $
+# $Id: Makefile.in,v 1.36.2.2 2007/08/12 12:40:53 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -109,6 +109,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -201,8 +202,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -217,24 +216,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/Makefile.in squid-2.6.STABLE15/helpers/digest_auth/Makefile.in
--- squid-2.6.STABLE14/helpers/digest_auth/Makefile.in Sat Jun 23 15:51:54 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/Makefile.in Sun Aug 12 06:40:53 2007
@@ -16,7 +16,7 @@
# Makefile for digest auth helpers in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.36.2.2 2007/06/23 21:51:54 hno Exp $
+# $Id: Makefile.in,v 1.36.2.3 2007/08/12 12:40:53 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/eDirectory/Makefile.in squid-2.6.STABLE15/helpers/digest_auth/eDirectory/Makefile.in
--- squid-2.6.STABLE14/helpers/digest_auth/eDirectory/Makefile.in Sat Jun 23 15:48:49 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/eDirectory/Makefile.in Sun Aug 12 06:40:54 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.2.1 2007/06/23 21:48:49 hno Exp $
+# $Id: Makefile.in,v 1.1.2.2 2007/08/12 12:40:54 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -127,6 +127,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,8 +220,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -235,24 +234,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/eDirectory/digest_common.h squid-2.6.STABLE15/helpers/digest_auth/eDirectory/digest_common.h
--- squid-2.6.STABLE14/helpers/digest_auth/eDirectory/digest_common.h Sat Jun 23 15:48:49 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/eDirectory/digest_common.h Fri Aug 31 08:16:18 2007
@@ -18,11 +18,17 @@
#if HAVE_STDLIB_H
#include
#endif
+#if HAVE_CTYPE_H
+#include
+#endif
#if HAVE_UNISTD_H
#include
#endif
#if HAVE_STRING_H
#include
+#endif
+#if HAVE_STRINGS_H
+#include
#endif
#if HAVE_SYS_TYPES_H
#include
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/eDirectory/edir_ldapext.c squid-2.6.STABLE15/helpers/digest_auth/eDirectory/edir_ldapext.c
--- squid-2.6.STABLE14/helpers/digest_auth/eDirectory/edir_ldapext.c Sat Jun 23 15:48:49 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/eDirectory/edir_ldapext.c Fri Aug 31 08:16:18 2007
@@ -19,10 +19,33 @@
* find current contact information at www.novell.com.
*/
+#include "digest_common.h"
+
+#ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */
+
+#define snprintf _snprintf
+#include
+#include
+#include
+#ifndef LDAPAPI
+#define LDAPAPI __cdecl
+#endif
+#ifdef LDAP_VERSION3
+#ifndef LDAP_OPT_X_TLS
+#define LDAP_OPT_X_TLS 0x6000
+#endif
+#define ber_alloc() ber_alloc_t(0)
+#endif /* LDAP_VERSION3 */
+
+#else
+
+#include
#include
-#include
-#include
-#include
+
+#endif
+
+#include "edir_ldapext.h"
+
/* NMAS error codes */
#define NMAS_E_BASE (-1600)
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/eDirectory/edir_ldapext.h squid-2.6.STABLE15/helpers/digest_auth/eDirectory/edir_ldapext.h
--- squid-2.6.STABLE14/helpers/digest_auth/eDirectory/edir_ldapext.h Sat Jun 23 15:48:49 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/eDirectory/edir_ldapext.h Fri Aug 31 08:16:18 2007
@@ -6,8 +6,6 @@
* stubs for FreeRadius's edir_ldapext.h
*
*/
-#include
-
#define UNIVERSAL_PASS_LEN 256
#define NMAS_SUCCESS 0
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/eDirectory/ldap_backend.c squid-2.6.STABLE15/helpers/digest_auth/eDirectory/ldap_backend.c
--- squid-2.6.STABLE14/helpers/digest_auth/eDirectory/ldap_backend.c Sat Jun 23 15:48:49 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/eDirectory/ldap_backend.c Fri Aug 31 08:16:18 2007
@@ -8,12 +8,7 @@
#define LDAP_DEPRECATED 1
-#include
-#include
-#include
-#include
#include "ldap_backend.h"
-#include "edir_ldapext.h"
#ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */
@@ -48,6 +43,7 @@
#include
#endif
+#include "edir_ldapext.h"
#define PROGRAM_NAME "digest_pw_auth(LDAP_backend)"
/* Globals */
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/ldap/Makefile.in squid-2.6.STABLE15/helpers/digest_auth/ldap/Makefile.in
--- squid-2.6.STABLE14/helpers/digest_auth/ldap/Makefile.in Fri Jun 22 18:14:48 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/ldap/Makefile.in Sun Aug 12 06:40:54 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.17.2.1 2007/06/23 00:14:48 hno Exp $
+# $Id: Makefile.in,v 1.17.2.2 2007/08/12 12:40:54 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -127,6 +127,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,8 +220,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -235,24 +234,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/ldap/digest_common.h squid-2.6.STABLE15/helpers/digest_auth/ldap/digest_common.h
--- squid-2.6.STABLE14/helpers/digest_auth/ldap/digest_common.h Mon May 15 19:21:29 2006
+++ squid-2.6.STABLE15/helpers/digest_auth/ldap/digest_common.h Fri Aug 31 08:16:18 2007
@@ -18,6 +18,9 @@
#if HAVE_STDLIB_H
#include
#endif
+#if HAVE_CTYPE_H
+#include
+#endif
#if HAVE_UNISTD_H
#include
#endif
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/ldap/ldap_backend.c squid-2.6.STABLE15/helpers/digest_auth/ldap/ldap_backend.c
--- squid-2.6.STABLE14/helpers/digest_auth/ldap/ldap_backend.c Wed Dec 27 11:26:39 2006
+++ squid-2.6.STABLE15/helpers/digest_auth/ldap/ldap_backend.c Fri Aug 31 08:16:18 2007
@@ -8,10 +8,6 @@
#define LDAP_DEPRECATED 1
-#include
-#include
-#include
-#include
#include "ldap_backend.h"
#ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */
@@ -52,14 +48,14 @@
/* Globals */
static LDAP *ld = NULL;
-static char *passattr = NULL;
-static char *ldapServer = NULL;
-static char *userbasedn = NULL;
-static char *userdnattr = NULL;
-static char *usersearchfilter = NULL;
-static char *binddn = NULL;
-static char *bindpasswd = NULL;
-static char *delimiter = ":";
+static const char *passattr = NULL;
+static const char *ldapServer = NULL;
+static const char *userbasedn = NULL;
+static const char *userdnattr = NULL;
+static const char *usersearchfilter = NULL;
+static const char *binddn = NULL;
+static const char *bindpasswd = NULL;
+static const char *delimiter = ":";
static int encrpass = 0;
static int searchscope = LDAP_SCOPE_SUBTREE;
static int persistent = 0;
@@ -82,7 +78,7 @@
#endif
static void ldapconnect(void);
-static int readSecret(char *filename);
+static int readSecret(const char *filename);
/* Yuck.. we need to glue to different versions of the API */
@@ -398,8 +394,8 @@
setbuf(stdout, NULL);
while (argc > 1 && argv[1][0] == '-') {
- char *value = "";
- char option = argv[1][1];
+ const char *value = "";
+ const char option = argv[1][1];
switch (option) {
case 'P':
case 'R':
@@ -434,7 +430,7 @@
int len = strlen(ldapServer) + 1 + strlen(value) + 1;
char *newhost = malloc(len);
snprintf(newhost, len, "%s %s", ldapServer, value);
- free(ldapServer);
+ free((char *)ldapServer);
ldapServer = newhost;
} else {
ldapServer = strdup(value);
@@ -560,7 +556,7 @@
int len = strlen(ldapServer) + 1 + strlen(value) + 1;
char *newhost = malloc(len);
snprintf(newhost, len, "%s %s", ldapServer, value);
- free(ldapServer);
+ free((char *)ldapServer);
ldapServer = newhost;
} else {
ldapServer = strdup(value);
@@ -573,13 +569,13 @@
ldapServer = "localhost";
if (!userbasedn || !passattr) {
- fprintf(stderr, "Usage: " PROGRAM_NAME " -b basedn -f filter [options] ldap_server_name\n\n");
+ fprintf(stderr, "Usage: " PROGRAM_NAME " -b basedn -A passwdattr -F filter | -u userattr [options] [ldap_server_name]\n\n");
fprintf(stderr, "\t-A password attribute(REQUIRED)\t\tUser attribute that contains the password\n");
- fprintf(stderr, "\t-l password realm delimiter(REQUIRED)\tCharater(s) that devides the password attribute\n\t\t\t\t\t\tin realm and password tokens, default ':' realm:password\n");
+ fprintf(stderr, "\t-l password realm delimiter\t\tCharater(s) that devides the password attribute\n\t\t\t\t\t\tin realm and password tokens, default ':' realm:password\n");
fprintf(stderr, "\t-b basedn (REQUIRED)\t\t\tbase dn under where to search for users\n");
- fprintf(stderr, "\t-e Encrypted passwords(REQUIRED)\tPassword are stored encrypted using HHA1\n");
- fprintf(stderr, "\t-F filter\t\t\t\tuser search filter pattern. %%s = login\n");
- fprintf(stderr, "\t-u attribute\t\t\t\tattribute to use in combination with the basedn to create the user DN\n");
+ fprintf(stderr, "\t-e Encrypted passwords\t\t\tPasswords are stored encrypted digest H(A1)\n");
+ fprintf(stderr, "\t-F filter (REQUIRED*)\t\t\tuser search filter pattern. %%s = login\n");
+ fprintf(stderr, "\t-u attribute (REQUIRED*)\t\tattribute to use in combination with the basedn to create the user DN\n");
fprintf(stderr, "\t-s base|one|sub\t\t\t\tsearch scope\n");
fprintf(stderr, "\t-D binddn\t\t\t\tDN to bind as to perform searches\n");
fprintf(stderr, "\t-w bindpasswd\t\t\t\tpassword for binddn\n");
@@ -599,9 +595,10 @@
fprintf(stderr, "\t-a never|always|search|find\t\twhen to dereference aliases\n");
#ifdef LDAP_VERSION3
fprintf(stderr, "\t-v 2|3\t\t\t\t\tLDAP version\n");
- fprintf(stderr, "\t-Z\t\t\t\t\tTLS encrypt the LDAP connection, requires\n\t\t\t\tLDAP version 3\n");
+ fprintf(stderr, "\t-Z\t\t\t\t\tTLS encrypt the LDAP connection, requires\n\t\t\t\t\t\tLDAP version 3\n");
#endif
fprintf(stderr, "\t-S\t\t\t\t\tStrip NT domain from usernames\n");
+ fprintf(stderr, "\n\t*) one of -u or -F needs to be specified. If both is specified -y is ignored\n");
fprintf(stderr, "\n");
fprintf(stderr, "\tIf you need to bind as a user to perform searches then use the\n\t-D binddn -w bindpasswd or -D binddn -W secretfile options\n\n");
return -1;
@@ -609,7 +606,7 @@
return 0;
}
static int
-readSecret(char *filename)
+readSecret(const char *filename)
{
char buf[BUFSIZ];
char *e = 0;
@@ -630,11 +627,10 @@
if ((e = strrchr(buf, '\r')))
*e = 0;
- bindpasswd = (char *) calloc(sizeof(char), strlen(buf) + 1);
- if (bindpasswd) {
- strcpy(bindpasswd, buf);
- } else {
+ bindpasswd = strdup(buf);
+ if (!bindpasswd) {
fprintf(stderr, PROGRAM_NAME " ERROR: can not allocate memory\n");
+ exit(1);
}
fclose(f);
@@ -645,7 +641,7 @@
void
LDAPHHA1(RequestData * requestData)
{
- char *password = "";
+ char *password;
ldapconnect();
password = getpassword(requestData->user, requestData->realm);
if (password != NULL) {
diff -ruN squid-2.6.STABLE14/helpers/digest_auth/password/Makefile.in squid-2.6.STABLE15/helpers/digest_auth/password/Makefile.in
--- squid-2.6.STABLE14/helpers/digest_auth/password/Makefile.in Fri Jun 22 18:14:48 2007
+++ squid-2.6.STABLE15/helpers/digest_auth/password/Makefile.in Sun Aug 12 06:40:54 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.38.2.1 2007/06/23 00:14:48 hno Exp $
+# $Id: Makefile.in,v 1.38.2.2 2007/08/12 12:40:54 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -126,6 +126,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -218,8 +219,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -234,24 +233,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/Makefile.in squid-2.6.STABLE15/helpers/external_acl/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/Makefile.in Fri Jun 22 18:14:49 2007
+++ squid-2.6.STABLE15/helpers/external_acl/Makefile.in Sun Aug 12 06:40:54 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.26.2.1 2007/06/23 00:14:49 hno Exp $
+# $Id: Makefile.in,v 1.26.2.2 2007/08/12 12:40:54 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/ip_user/Makefile.in squid-2.6.STABLE15/helpers/external_acl/ip_user/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/ip_user/Makefile.in Fri Jun 22 18:14:49 2007
+++ squid-2.6.STABLE15/helpers/external_acl/ip_user/Makefile.in Sun Aug 12 06:40:55 2007
@@ -17,7 +17,7 @@
#
# Makefile for the ip_user external_acl helper by Rodrigo Campos
#
-# $Id: Makefile.in,v 1.25.2.1 2007/06/23 00:14:49 hno Exp $
+# $Id: Makefile.in,v 1.25.2.2 2007/08/12 12:40:55 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -124,6 +124,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -216,8 +217,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -232,24 +231,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/ldap_group/Makefile.in squid-2.6.STABLE15/helpers/external_acl/ldap_group/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/ldap_group/Makefile.in Fri Jun 22 18:14:50 2007
+++ squid-2.6.STABLE15/helpers/external_acl/ldap_group/Makefile.in Sun Aug 12 06:40:55 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid LDAP authentication helper
#
-# $Id: Makefile.in,v 1.26.2.1 2007/06/23 00:14:50 hno Exp $
+# $Id: Makefile.in,v 1.26.2.2 2007/08/12 12:40:55 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -129,6 +129,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -221,8 +222,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -237,24 +236,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/mswin_lm_group/Makefile.in squid-2.6.STABLE15/helpers/external_acl/mswin_lm_group/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/mswin_lm_group/Makefile.in Fri Jun 22 18:14:50 2007
+++ squid-2.6.STABLE15/helpers/external_acl/mswin_lm_group/Makefile.in Sun Aug 12 06:40:57 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.11.2.1 2007/06/23 00:14:50 hno Exp $
+# $Id: Makefile.in,v 1.11.2.2 2007/08/12 12:40:57 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -124,6 +124,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -216,8 +217,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -232,24 +231,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/session/Makefile.in squid-2.6.STABLE15/helpers/external_acl/session/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/session/Makefile.in Fri Jun 22 18:14:51 2007
+++ squid-2.6.STABLE15/helpers/external_acl/session/Makefile.in Sun Aug 12 06:40:57 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid LDAP authentication helper
#
-# $Id: Makefile.in,v 1.12.2.1 2007/06/23 00:14:51 hno Exp $
+# $Id: Makefile.in,v 1.12.2.2 2007/08/12 12:40:57 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -127,6 +127,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,8 +220,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -235,24 +234,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/unix_group/Makefile.in squid-2.6.STABLE15/helpers/external_acl/unix_group/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/unix_group/Makefile.in Fri Jun 22 18:14:51 2007
+++ squid-2.6.STABLE15/helpers/external_acl/unix_group/Makefile.in Sun Aug 12 06:40:58 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid LDAP authentication helper
#
-# $Id: Makefile.in,v 1.25.2.1 2007/06/23 00:14:51 hno Exp $
+# $Id: Makefile.in,v 1.25.2.2 2007/08/12 12:40:58 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -126,6 +126,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -218,8 +219,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -234,24 +233,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/external_acl/wbinfo_group/Makefile.in squid-2.6.STABLE15/helpers/external_acl/wbinfo_group/Makefile.in
--- squid-2.6.STABLE14/helpers/external_acl/wbinfo_group/Makefile.in Fri Jun 22 18:14:51 2007
+++ squid-2.6.STABLE15/helpers/external_acl/wbinfo_group/Makefile.in Sun Aug 12 06:40:58 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid LDAP authentication helper
#
-# $Id: Makefile.in,v 1.24.2.1 2007/06/23 00:14:51 hno Exp $
+# $Id: Makefile.in,v 1.24.2.2 2007/08/12 12:40:58 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -109,6 +109,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -201,8 +202,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -217,24 +216,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/negotiate_auth/Makefile.in squid-2.6.STABLE15/helpers/negotiate_auth/Makefile.in
--- squid-2.6.STABLE14/helpers/negotiate_auth/Makefile.in Fri Jun 22 18:14:52 2007
+++ squid-2.6.STABLE15/helpers/negotiate_auth/Makefile.in Sun Aug 12 06:40:58 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.13.2.2 2007/06/23 00:14:52 hno Exp $
+# $Id: Makefile.in,v 1.13.2.3 2007/08/12 12:40:58 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/negotiate_auth/mswin_sspi/Makefile.in squid-2.6.STABLE15/helpers/negotiate_auth/mswin_sspi/Makefile.in
--- squid-2.6.STABLE14/helpers/negotiate_auth/mswin_sspi/Makefile.in Fri Jun 22 18:14:52 2007
+++ squid-2.6.STABLE15/helpers/negotiate_auth/mswin_sspi/Makefile.in Sun Aug 12 06:40:58 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.11.2.1 2007/06/23 00:14:52 hno Exp $
+# $Id: Makefile.in,v 1.11.2.2 2007/08/12 12:40:58 hno Exp $
#
srcdir = @srcdir@
@@ -123,6 +123,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -215,8 +216,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -231,24 +230,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/negotiate_auth/squid_kerb_auth/Makefile.in squid-2.6.STABLE15/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
--- squid-2.6.STABLE14/helpers/negotiate_auth/squid_kerb_auth/Makefile.in Fri Jun 22 18:14:52 2007
+++ squid-2.6.STABLE15/helpers/negotiate_auth/squid_kerb_auth/Makefile.in Sun Aug 12 06:40:59 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.2.2.3 2007/06/23 00:14:52 hno Exp $
+# $Id: Makefile.in,v 1.2.2.4 2007/08/12 12:40:59 hno Exp $
#
srcdir = @srcdir@
@@ -125,6 +125,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -217,8 +218,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -233,24 +232,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/Makefile.in Fri Jun 22 18:14:53 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/Makefile.in Sun Aug 12 06:41:00 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.39.2.1 2007/06/23 00:14:53 hno Exp $
+# $Id: Makefile.in,v 1.39.2.2 2007/08/12 12:41:00 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/SMB/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/SMB/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/SMB/Makefile.in Fri Jun 22 18:14:53 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/SMB/Makefile.in Sun Aug 12 06:41:03 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.38.2.1 2007/06/23 00:14:53 hno Exp $
+# $Id: Makefile.in,v 1.38.2.2 2007/08/12 12:41:03 hno Exp $
#
srcdir = @srcdir@
@@ -130,6 +130,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -222,8 +223,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -238,24 +237,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/SMB/smbval/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/SMB/smbval/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/SMB/smbval/Makefile.in Fri Jun 22 18:14:54 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/SMB/smbval/Makefile.in Sun Aug 12 06:41:03 2007
@@ -118,6 +118,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -210,8 +211,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -226,24 +225,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/fakeauth/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/fakeauth/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/fakeauth/Makefile.in Fri Jun 22 18:14:54 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/fakeauth/Makefile.in Sun Aug 12 06:41:04 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.37.2.1 2007/06/23 00:14:54 hno Exp $
+# $Id: Makefile.in,v 1.37.2.2 2007/08/12 12:41:04 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -125,6 +125,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -217,8 +218,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -233,24 +232,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/mswin_sspi/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/mswin_sspi/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/mswin_sspi/Makefile.in Fri Jun 22 18:14:54 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/mswin_sspi/Makefile.in Sun Aug 12 06:41:04 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.11.2.1 2007/06/23 00:14:54 hno Exp $
+# $Id: Makefile.in,v 1.11.2.2 2007/08/12 12:41:04 hno Exp $
#
srcdir = @srcdir@
@@ -122,6 +122,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -214,8 +215,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -230,24 +229,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/helpers/ntlm_auth/no_check/Makefile.in squid-2.6.STABLE15/helpers/ntlm_auth/no_check/Makefile.in
--- squid-2.6.STABLE14/helpers/ntlm_auth/no_check/Makefile.in Fri Jun 22 18:14:55 2007
+++ squid-2.6.STABLE15/helpers/ntlm_auth/no_check/Makefile.in Sun Aug 12 06:41:05 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.39.2.1 2007/06/23 00:14:55 hno Exp $
+# $Id: Makefile.in,v 1.39.2.2 2007/08/12 12:41:05 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -109,6 +109,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -201,8 +202,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -217,24 +216,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/icons/Makefile.in squid-2.6.STABLE15/icons/Makefile.in
--- squid-2.6.STABLE14/icons/Makefile.in Fri Jun 22 18:14:55 2007
+++ squid-2.6.STABLE15/icons/Makefile.in Sun Aug 12 06:41:05 2007
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.49.2.1 2007/06/23 00:14:55 hno Exp $
+# $Id: Makefile.in,v 1.49.2.2 2007/08/12 12:41:05 hno Exp $
#
srcdir = @srcdir@
@@ -110,6 +110,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -202,8 +203,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -218,24 +217,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/include/autoconf.h.in squid-2.6.STABLE15/include/autoconf.h.in
--- squid-2.6.STABLE14/include/autoconf.h.in Sat Jun 23 15:51:56 2007
+++ squid-2.6.STABLE15/include/autoconf.h.in Sun Aug 12 06:41:06 2007
@@ -657,67 +657,67 @@
/* Print stacktraces on fatal errors */
#undef PRINT_STACK_TRACE
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
-/* The size of a `int16_t', as computed by sizeof. */
+/* The size of `int16_t', as computed by sizeof. */
#undef SIZEOF_INT16_T
-/* The size of a `int32_t', as computed by sizeof. */
+/* The size of `int32_t', as computed by sizeof. */
#undef SIZEOF_INT32_T
-/* The size of a `int64_t', as computed by sizeof. */
+/* The size of `int64_t', as computed by sizeof. */
#undef SIZEOF_INT64_T
-/* The size of a `int8_t', as computed by sizeof. */
+/* The size of `int8_t', as computed by sizeof. */
#undef SIZEOF_INT8_T
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
-/* The size of a `off_t', as computed by sizeof. */
+/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
-/* The size of a `size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
-/* The size of a `uint16_t', as computed by sizeof. */
+/* The size of `uint16_t', as computed by sizeof. */
#undef SIZEOF_UINT16_T
-/* The size of a `uint32_t', as computed by sizeof. */
+/* The size of `uint32_t', as computed by sizeof. */
#undef SIZEOF_UINT32_T
-/* The size of a `uint64_t', as computed by sizeof. */
+/* The size of `uint64_t', as computed by sizeof. */
#undef SIZEOF_UINT64_T
-/* The size of a `uint8_t', as computed by sizeof. */
+/* The size of `uint8_t', as computed by sizeof. */
#undef SIZEOF_UINT8_T
-/* The size of a `u_int16_t', as computed by sizeof. */
+/* The size of `u_int16_t', as computed by sizeof. */
#undef SIZEOF_U_INT16_T
-/* The size of a `u_int32_t', as computed by sizeof. */
+/* The size of `u_int32_t', as computed by sizeof. */
#undef SIZEOF_U_INT32_T
-/* The size of a `u_int64_t', as computed by sizeof. */
+/* The size of `u_int64_t', as computed by sizeof. */
#undef SIZEOF_U_INT64_T
-/* The size of a `u_int8_t', as computed by sizeof. */
+/* The size of `u_int8_t', as computed by sizeof. */
#undef SIZEOF_U_INT8_T
-/* The size of a `void *', as computed by sizeof. */
+/* The size of `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P
-/* The size of a `__int64', as computed by sizeof. */
+/* The size of `__int64', as computed by sizeof. */
#undef SIZEOF___INT64
/* configure command line used to configure Squid */
@@ -743,7 +743,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
diff -ruN squid-2.6.STABLE14/include/version.h squid-2.6.STABLE15/include/version.h
--- squid-2.6.STABLE14/include/version.h Sun Jul 15 08:21:59 2007
+++ squid-2.6.STABLE15/include/version.h Fri Aug 31 08:55:13 2007
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1184509316
+#define SQUID_RELEASE_TIME 1188572108
#endif
diff -ruN squid-2.6.STABLE14/lib/Makefile.in squid-2.6.STABLE15/lib/Makefile.in
--- squid-2.6.STABLE14/lib/Makefile.in Fri Jun 22 18:14:55 2007
+++ squid-2.6.STABLE15/lib/Makefile.in Sun Aug 12 06:41:06 2007
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.in,v 1.88.2.1 2007/06/23 00:14:55 hno Exp $
+# $Id: Makefile.in,v 1.88.2.2 2007/08/12 12:41:06 hno Exp $
#
srcdir = @srcdir@
@@ -155,6 +155,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -247,8 +248,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -263,24 +262,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/scripts/Makefile.in squid-2.6.STABLE15/scripts/Makefile.in
--- squid-2.6.STABLE14/scripts/Makefile.in Fri Jun 22 18:14:56 2007
+++ squid-2.6.STABLE15/scripts/Makefile.in Sun Aug 12 06:41:06 2007
@@ -107,6 +107,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -199,8 +200,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -215,24 +214,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/snmplib/Makefile.in squid-2.6.STABLE15/snmplib/Makefile.in
--- squid-2.6.STABLE14/snmplib/Makefile.in Fri Jun 22 18:14:56 2007
+++ squid-2.6.STABLE15/snmplib/Makefile.in Sun Aug 12 06:41:07 2007
@@ -116,6 +116,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -208,8 +209,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -224,24 +223,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/snmplib/snmp_api.c squid-2.6.STABLE15/snmplib/snmp_api.c
--- squid-2.6.STABLE14/snmplib/snmp_api.c Fri Jun 2 11:32:44 2006
+++ squid-2.6.STABLE15/snmplib/snmp_api.c Fri Aug 31 08:08:52 2007
@@ -121,7 +121,7 @@
}
/*
- * Parses the packet recieved on the input session, and places the data into
+ * Parses the packet received on the input session, and places the data into
* the input pdu. length is the length of the input packet. If any errors
* are encountered, NULL is returned. If not, the community is.
*/
diff -ruN squid-2.6.STABLE14/src/HttpHeaderTools.c squid-2.6.STABLE15/src/HttpHeaderTools.c
--- squid-2.6.STABLE14/src/HttpHeaderTools.c Sun Jul 15 03:52:17 2007
+++ squid-2.6.STABLE15/src/HttpHeaderTools.c Sat Jul 21 15:15:31 2007
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHeaderTools.c,v 1.37.2.1 2007/07/15 09:52:17 hno Exp $
+ * $Id: HttpHeaderTools.c,v 1.37.2.2 2007/07/21 21:15:31 hno Exp $
*
* DEBUG: section 66 HTTP Header Tools
* AUTHOR: Alex Rousskov
@@ -194,8 +194,9 @@
int
strIsSubstr(const String * list, const char *s)
{
+ const char *p;
assert(list && s);
- const char *p = strStr(*list, s);
+ p = strStr(*list, s);
if (!p)
return 0;
if (strstr(p + 1, s) != NULL)
diff -ruN squid-2.6.STABLE14/src/Makefile.in squid-2.6.STABLE15/src/Makefile.in
--- squid-2.6.STABLE14/src/Makefile.in Fri Jun 22 18:14:56 2007
+++ squid-2.6.STABLE15/src/Makefile.in Sun Aug 12 06:41:07 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.281.2.2 2007/06/23 00:14:56 hno Exp $
+# $Id: Makefile.in,v 1.281.2.3 2007/08/12 12:41:07 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -248,6 +248,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -340,8 +341,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -356,24 +355,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/src/auth/Makefile.in squid-2.6.STABLE15/src/auth/Makefile.in
--- squid-2.6.STABLE14/src/auth/Makefile.in Fri Jun 22 18:14:58 2007
+++ squid-2.6.STABLE15/src/auth/Makefile.in Sun Aug 12 06:41:08 2007
@@ -128,6 +128,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -220,8 +221,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -236,24 +235,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -261,7 +267,7 @@
# Makefile for authentication modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.38.2.1 2007/06/23 00:14:58 hno Exp $
+# $Id: Makefile.in,v 1.38.2.2 2007/08/12 12:41:08 hno Exp $
#
AUTOMAKE_OPTIONS = subdir-objects
EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a
diff -ruN squid-2.6.STABLE14/src/auth/digest/auth_digest.c squid-2.6.STABLE15/src/auth/digest/auth_digest.c
--- squid-2.6.STABLE14/src/auth/digest/auth_digest.c Sun Jul 30 17:27:04 2006
+++ squid-2.6.STABLE15/src/auth/digest/auth_digest.c Fri Aug 31 08:08:53 2007
@@ -1,6 +1,6 @@
/*
- * $Id: auth_digest.c,v 1.21 2006/07/30 23:27:04 hno Exp $
+ * $Id: auth_digest.c,v 1.21.2.1 2007/08/31 14:08:53 hno Exp $
*
* DEBUG: section 29 Authenticator
* AUTHOR: Robert Collins
@@ -1271,7 +1271,7 @@
nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
if (!nonce) {
/* we couldn't find a matching nonce! */
- debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce recieved\n");
+ debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce received\n");
authDigestLogUsername(auth_user_request, username);
/* we don't need the scheme specific data anymore */
@@ -1285,8 +1285,8 @@
/* check the qop is what we expected. Note that for compatability with
* RFC 2069 we should support a missing qop. Tough. */
if (!digest_request->qop || strcmp(digest_request->qop, QOP_AUTH)) {
- /* we recieved a qop option we didn't send */
- debug(29, 4) ("authenticateDigestDecode: Invalid qop option recieved\n");
+ /* we received a qop option we didn't send */
+ debug(29, 4) ("authenticateDigestDecode: Invalid qop option received\n");
authDigestLogUsername(auth_user_request, username);
/* we don't need the scheme specific data anymore */
diff -ruN squid-2.6.STABLE14/src/auth/negotiate/auth_negotiate.c squid-2.6.STABLE15/src/auth/negotiate/auth_negotiate.c
--- squid-2.6.STABLE14/src/auth/negotiate/auth_negotiate.c Sun Jul 15 07:57:02 2007
+++ squid-2.6.STABLE15/src/auth/negotiate/auth_negotiate.c Fri Aug 31 08:08:53 2007
@@ -1,6 +1,6 @@
/*
- * $Id: auth_negotiate.c,v 1.7.2.2 2007/07/15 13:57:02 hno Exp $
+ * $Id: auth_negotiate.c,v 1.7.2.4 2007/08/31 14:08:53 hno Exp $
*
* DEBUG: section 29 Negotiate Authenticator
* AUTHOR: Robert Collins
@@ -334,7 +334,6 @@
debug(29, 9) ("authenticateNegotiateFixErrorHeader: Sending type:%d header: 'Negotiate %s'\n", type, negotiate_request->server_blob);
httpHeaderPutStrf(&rep->header, type, "Negotiate %s", negotiate_request->server_blob);
safe_free(negotiate_request->server_blob);
- request->flags.must_keepalive = 1;
break;
case AUTHENTICATE_STATE_DONE:
/* Special case when authentication finished, but not allowed by ACL */
@@ -383,6 +382,10 @@
debug(29, 9) ("authenticateNegotiateRequestFree: releasing server '%p'\n", negotiate_request->authserver);
authenticateNegotiateReleaseServer(negotiate_request);
}
+ if (negotiate_request->request) {
+ requestUnlink(negotiate_request->request);
+ negotiate_request->request = NULL;
+ }
memPoolFree(negotiate_request_pool, negotiate_request);
}
@@ -478,11 +481,18 @@
if (arg)
*arg++ = '\0';
safe_free(negotiate_request->server_blob);
- negotiate_request->server_blob = xstrdup(blob);
- negotiate_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE;
- safe_free(auth_user_request->message);
- auth_user_request->message = xstrdup("Authentication in progress");
- debug(29, 4) ("authenticateNegotiateHandleReply: Need to challenge the client with a server blob '%s'\n", blob);
+ negotiate_request->request->flags.must_keepalive = 1;
+ if (negotiate_request->request->flags.proxy_keepalive) {
+ negotiate_request->server_blob = xstrdup(blob);
+ negotiate_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE;
+ safe_free(auth_user_request->message);
+ auth_user_request->message = xstrdup("Authentication in progress");
+ debug(29, 4) ("authenticateNegotiateHandleReply: Need to challenge the client with a server blob '%s'\n", blob);
+ } else {
+ negotiate_request->auth_state = AUTHENTICATE_STATE_FAILED;
+ safe_free(auth_user_request->message);
+ auth_user_request->message = xstrdup("NTLM authentication requires a persistent connection");
+ }
} else if (strncasecmp(reply, "AF ", 3) == 0 && arg != NULL) {
auth_user_hash_pointer *usernamehash;
/* we're finished, release the helper */
@@ -544,6 +554,8 @@
} else {
fatalf("authenticateNegotiateHandleReply: *** Unsupported helper response ***, '%s'\n", reply);
}
+ requestUnlink(negotiate_request->request);
+ negotiate_request->request = NULL;
r->handler(r->data, NULL);
cbdataUnlock(r->data);
authenticateStateFree(r);
@@ -702,12 +714,6 @@
debug(29, 1) ("authenticateNegotiateAuthenticateUser: attempt to perform authentication without a connection!\n");
return;
}
- if (!request->flags.proxy_keepalive) {
- debug(29, 2) ("authenticateNegotiateAuthenticateUser: attempt to perform authentication without a persistent connection!\n");
- negotiate_request->auth_state = AUTHENTICATE_STATE_FAILED;
- request->flags.must_keepalive = 1;
- return;
- }
if (negotiate_request->waiting) {
debug(29, 1) ("authenticateNegotiateAuthenticateUser: waiting for helper reply!\n");
return;
@@ -728,7 +734,7 @@
switch (negotiate_request->auth_state) {
case AUTHENTICATE_STATE_NONE:
- /* we've recieved a negotiate request. pass to a helper */
+ /* we've received a negotiate request. pass to a helper */
debug(29, 9) ("authenticateNegotiateAuthenticateUser: auth state negotiate none. %s\n", proxy_auth);
negotiate_request->auth_state = AUTHENTICATE_STATE_INITIAL;
safe_free(negotiate_request->client_blob);
@@ -739,6 +745,7 @@
/* and lock for the connection duration */
debug(29, 9) ("authenticateNegotiateAuthenticateUser: Locking auth_user from the connection.\n");
authenticateAuthUserRequestLock(auth_user_request);
+ negotiate_request->request = requestLink(request);
return;
break;
case AUTHENTICATE_STATE_INITIAL:
@@ -746,7 +753,7 @@
return;
break;
case AUTHENTICATE_STATE_NEGOTIATE:
- /* we should have recieved a blob from the clien. pass it to the same
+ /* we should have received a blob from the clien. pass it to the same
* helper process */
debug(29, 9) ("authenticateNegotiateAuthenticateUser: auth state challenge with header %s.\n", proxy_auth);
/* do a cache lookup here. If it matches it's a successful negotiate
@@ -754,6 +761,9 @@
* details. */
safe_free(negotiate_request->client_blob);
negotiate_request->client_blob = xstrdup(blob);
+ if (negotiate_request->request)
+ requestUnlink(negotiate_request->request);
+ negotiate_request->request = requestLink(request);
return;
break;
case AUTHENTICATE_STATE_DONE:
diff -ruN squid-2.6.STABLE14/src/auth/negotiate/auth_negotiate.h squid-2.6.STABLE15/src/auth/negotiate/auth_negotiate.h
--- squid-2.6.STABLE14/src/auth/negotiate/auth_negotiate.h Tue Feb 27 15:43:52 2007
+++ squid-2.6.STABLE15/src/auth/negotiate/auth_negotiate.h Fri Aug 31 07:49:14 2007
@@ -41,6 +41,8 @@
char *server_blob;
/* our current blob to pass to the server */
char *client_blob;
+ /* the HTTP request */
+ request_t *request;
};
/* configuration runtime data */
diff -ruN squid-2.6.STABLE14/src/auth/ntlm/auth_ntlm.c squid-2.6.STABLE15/src/auth/ntlm/auth_ntlm.c
--- squid-2.6.STABLE14/src/auth/ntlm/auth_ntlm.c Sun Jul 15 07:57:02 2007
+++ squid-2.6.STABLE15/src/auth/ntlm/auth_ntlm.c Fri Aug 31 08:08:53 2007
@@ -1,6 +1,6 @@
/*
- * $Id: auth_ntlm.c,v 1.37.2.2 2007/07/15 13:57:02 hno Exp $
+ * $Id: auth_ntlm.c,v 1.37.2.4 2007/08/31 14:08:53 hno Exp $
*
* DEBUG: section 29 NTLM Authenticator
* AUTHOR: Robert Collins
@@ -332,7 +332,6 @@
debug(29, 9) ("authenticateNTLMFixErrorHeader: Sending type:%d header: 'NTLM %s'\n", type, ntlm_request->server_blob);
httpHeaderPutStrf(&rep->header, type, "NTLM %s", ntlm_request->server_blob);
safe_free(ntlm_request->server_blob);
- request->flags.must_keepalive = 1;
break;
case AUTHENTICATE_STATE_DONE:
/* Special case when authentication finished, but not allowed by ACL */
@@ -356,6 +355,10 @@
debug(29, 9) ("authenticateNTLMRequestFree: releasing server '%p'\n", ntlm_request->authserver);
authenticateNTLMReleaseServer(ntlm_request);
}
+ if (ntlm_request->request) {
+ requestUnlink(ntlm_request->request);
+ ntlm_request->request = NULL;
+ }
memPoolFree(ntlm_request_pool, ntlm_request);
}
@@ -445,11 +448,18 @@
if (strncasecmp(reply, "TT ", 3) == 0) {
/* we have been given a blob to send to the client */
safe_free(ntlm_request->server_blob);
- ntlm_request->server_blob = xstrdup(blob);
- ntlm_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE;
- safe_free(auth_user_request->message);
- auth_user_request->message = xstrdup("Authentication in progress");
- debug(29, 4) ("authenticateNTLMHandleReply: Need to challenge the client with a server blob '%s'\n", blob);
+ ntlm_request->request->flags.must_keepalive = 1;
+ if (ntlm_request->request->flags.proxy_keepalive) {
+ ntlm_request->server_blob = xstrdup(blob);
+ ntlm_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE;
+ safe_free(auth_user_request->message);
+ auth_user_request->message = xstrdup("Authentication in progress");
+ debug(29, 4) ("authenticateNTLMHandleReply: Need to challenge the client with a server blob '%s'\n", blob);
+ } else {
+ ntlm_request->auth_state = AUTHENTICATE_STATE_FAILED;
+ safe_free(auth_user_request->message);
+ auth_user_request->message = xstrdup("NTLM authentication requires a persistent connection");
+ }
} else if (strncasecmp(reply, "AF ", 3) == 0) {
auth_user_hash_pointer *usernamehash;
/* we're finished, release the helper */
@@ -503,6 +513,8 @@
} else {
fatalf("authenticateNTLMHandleReply: *** Unsupported helper response ***, '%s'\n", reply);
}
+ requestUnlink(ntlm_request->request);
+ ntlm_request->request = NULL;
r->handler(r->data, NULL);
cbdataUnlock(r->data);
authenticateStateFree(r);
@@ -661,12 +673,6 @@
debug(29, 1) ("authenticateNTLMAuthenticateUser: attempt to perform authentication without a connection!\n");
return;
}
- if (!request->flags.proxy_keepalive) {
- debug(29, 2) ("authenticateNTLMAuthenticateUser: attempt to perform authentication without a persistent connection!\n");
- ntlm_request->auth_state = AUTHENTICATE_STATE_FAILED;
- request->flags.must_keepalive = 1;
- return;
- }
if (ntlm_request->waiting) {
debug(29, 1) ("authenticateNTLMAuthenticateUser: waiting for helper reply!\n");
return;
@@ -687,7 +693,7 @@
switch (ntlm_request->auth_state) {
case AUTHENTICATE_STATE_NONE:
- /* we've recieved a ntlm request. pass to a helper */
+ /* we've received a ntlm request. pass to a helper */
debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state ntlm none. %s\n", proxy_auth);
ntlm_request->auth_state = AUTHENTICATE_STATE_INITIAL;
safe_free(ntlm_request->client_blob);
@@ -698,6 +704,7 @@
/* and lock for the connection duration */
debug(29, 9) ("authenticateNTLMAuthenticateUser: Locking auth_user from the connection.\n");
authenticateAuthUserRequestLock(auth_user_request);
+ ntlm_request->request = requestLink(request);
return;
break;
case AUTHENTICATE_STATE_INITIAL:
@@ -705,7 +712,7 @@
return;
break;
case AUTHENTICATE_STATE_NEGOTIATE:
- /* we should have recieved a blob from the clien. pass it to the same
+ /* we should have received a blob from the clien. pass it to the same
* helper process */
debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state challenge with header %s.\n", proxy_auth);
/* do a cache lookup here. If it matches it's a successful ntlm
@@ -713,6 +720,9 @@
* details. */
safe_free(ntlm_request->client_blob);
ntlm_request->client_blob = xstrdup(blob);
+ if (ntlm_request->request)
+ requestUnlink(ntlm_request->request);
+ ntlm_request->request = requestLink(request);
return;
break;
case AUTHENTICATE_STATE_DONE:
diff -ruN squid-2.6.STABLE14/src/auth/ntlm/auth_ntlm.h squid-2.6.STABLE15/src/auth/ntlm/auth_ntlm.h
--- squid-2.6.STABLE14/src/auth/ntlm/auth_ntlm.h Tue Feb 27 15:43:52 2007
+++ squid-2.6.STABLE15/src/auth/ntlm/auth_ntlm.h Fri Aug 31 07:49:14 2007
@@ -41,6 +41,8 @@
char *server_blob;
/* our current blob to pass to the server */
char *client_blob;
+ /* the HTTP request */
+ request_t *request;
};
/* configuration runtime data */
diff -ruN squid-2.6.STABLE14/src/cache_cf.c squid-2.6.STABLE15/src/cache_cf.c
--- squid-2.6.STABLE14/src/cache_cf.c Sat Jun 23 16:50:18 2007
+++ squid-2.6.STABLE15/src/cache_cf.c Fri Aug 31 07:49:54 2007
@@ -1,6 +1,6 @@
/*
- * $Id: cache_cf.c,v 1.463.2.3 2007/06/23 22:50:18 hno Exp $
+ * $Id: cache_cf.c,v 1.463.2.4 2007/08/31 13:49:54 hno Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
@@ -1626,6 +1626,7 @@
p->stats.logged_state = PEER_ALIVE;
p->monitor.state = PEER_ALIVE;
p->monitor.interval = 300;
+ p->tcp_up = PEER_TCP_MAGIC_COUNT;
if ((token = strtok(NULL, w_space)) == NULL)
self_destruct();
p->host = xstrdup(token);
diff -ruN squid-2.6.STABLE14/src/cf.data.pre squid-2.6.STABLE15/src/cf.data.pre
--- squid-2.6.STABLE14/src/cf.data.pre Mon Jun 25 17:34:57 2007
+++ squid-2.6.STABLE15/src/cf.data.pre Tue Aug 21 18:14:30 2007
@@ -1,7 +1,6 @@
#
-# $Id: cf.data.pre,v 1.382.2.7 2007/06/25 23:34:57 hno Exp $
-#
+# $Id: cf.data.pre,v 1.382.2.12 2007/08/22 00:14:30 hno Exp $
#
# SQUID Web Proxy Cache http://www.squid-cache.org/
# ----------------------------------------------------------
@@ -78,38 +77,39 @@
Options:
- transparent Support for transparent interception of
- outgoing requests without browser settings.
+ transparent Support for transparent interception of
+ outgoing requests without browser settings.
- accel Accelerator mode. Also needs at least one
- of vhost/vport/defaultsite.
+ tproxy Support Linux TPROXY for spoofing outgoing
+ connections using the client IP address.
- defaultsite= Main web site name for accelerators. Implies
- accel.
+ accel Accelerator mode. Also needs at least one
+ of vhost/vport/defaultsite.
- vhost Accelerator mode using the Host header for
- virtual domain support. Implies accel.
+ defaultsite=domainname
+ What to use for the Host: header if it is not present
+ in a request. Determines what site (not origin server)
+ accelerators should consider the default.
+ Implies accel.
- vport Accelerator with IP based virtual host support.
- Implies accel.
+ vhost Accelerator mode using Host header for virtual
+ domain support. Implies accel.
- vport=NN As above, but uses specified port number rather
- than the http_port number. Implies accel.
+ vport Accelerator with IP based virtual host support.
+ Implies accel.
- urlgroup= Default urlgroup to mark requests with (see
- also acl urlgroup and url_rewrite_program)
+ vport=NN As above, but uses specified port number rather
+ than the http_port number. Implies accel.
- protocol= Protocol to reconstruct accelerated requests with.
- Defaults to http.
+ urlgroup= Default urlgroup to mark requests with (see
+ also acl urlgroup and url_rewrite_program)
- no-connection-auth
- Prevent forwarding of Microsoft
- connection oriented authentication
- (NTLM, Negotiate and Kerberos)
+ protocol= Protocol to reconstruct accelerated requests with.
+ Defaults to http.
- tproxy Support Linux TPROXY for spoofing
- outgoing connections using the client
- IP address.
+ no-connection-auth
+ Prevent forwarding of Microsoft connection oriented
+ authentication (NTLM, Negotiate and Kerberos)
If you run Squid on a dual-homed machine with an internal
and an external interface we recommend you to specify the
@@ -154,17 +154,17 @@
Implies accel.
urlgroup= Default urlgroup to mark requests with (see
- also acl urlgroup and url_rewrite_program)
+ also acl urlgroup and url_rewrite_program).
protocol= Protocol to reconstruct accelerated requests with.
Defaults to https.
- cert= Path to SSL certificate (PEM format)
+ cert= Path to SSL certificate (PEM format).
key= Path to SSL private key file (PEM format)
if not specified, the certificate file is
assumed to be a combined certificate and
- key file
+ key file.
version= The version of SSL/TLS supported
1 automatic (default)
@@ -172,7 +172,7 @@
3 SSLv3 only
4 TLSv1 only
- cipher= Colon separated list of supported ciphers
+ cipher= Colon separated list of supported ciphers.
options= Various SSL engine options. The most important
being:
@@ -185,27 +185,27 @@
documentation for a complete list of options.
clientca= File containing the list of CAs to use when
- requesting a client certificate
+ requesting a client certificate.
cafile= File containing additional CA certificates to
use when verifying client certificates. If unset
clientca will be used.
capath= Directory containing additional CA certificates
- and CRL lists to use when verifying client certificates
+ and CRL lists to use when verifying client certificates.
crlfile= File of additional CRL lists to use when verifying
the client certificate, in addition to CRLs stored in
the capath. Implies VERIFY_CRL flag below.
dhparams= File containing DH parameters for temporary/ephemeral
- DH key exchanges
+ DH key exchanges.
sslflags= Various flags modifying the use of SSL:
DELAYED_AUTH
Don't request client certificates
immediately, but wait until acl processing
- requires a certificate (not yet implemented)
+ requires a certificate (not yet implemented).
NO_DEFAULT_CA
Don't use the default CA lists built in
to OpenSSL.
@@ -214,15 +214,25 @@
will result in a new SSL session.
VERIFY_CRL
Verify CRL lists when accepting client
- certificates
+ certificates.
VERIFY_CRL_ALL
Verify CRL lists for all certificates in the
- client certificate chain
+ client certificate chain.
sslcontext= SSL session ID context identifier.
+ vport Accelerator with IP based virtual host support.
+
+ vport=NN As above, but uses specified port number rather
+ than the https_port number. Implies accel.
+
DOC_END
+COMMENT_START
+ SSL OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
NAME: ssl_unclean_shutdown
IFDEF: USE_SSL
TYPE: onoff
@@ -305,7 +315,7 @@
TYPE: string
DOC_START
directory containing CA certificates to use when verifying
- server certificates while proxying https:// URLs
+ server certificates while proxying https:// URLs
DOC_END
NAME: sslproxy_flags
@@ -315,10 +325,10 @@
TYPE: string
DOC_START
Various flags modifying the use of SSL while proxying https:// URLs:
- DONT_VERIFY_PEER Accept certificates even if they fail to
- verify.
- NO_DEFAULT_CA Don't use the default CA list built in
- to OpenSSL.
+ DONT_VERIFY_PEER Accept certificates even if they fail to
+ verify.
+ NO_DEFAULT_CA Don't use the default CA list built in
+ to OpenSSL.
DOC_END
NAME: sslpassword_program
@@ -333,85 +343,6 @@
option to allow it to query interactively for the passphrase.
DOC_END
-NAME: icp_port udp_port
-TYPE: ushort
-DEFAULT: @DEFAULT_ICP_PORT@
-LOC: Config.Port.icp
-DOC_START
- The port number where Squid sends and receives ICP queries to
- and from neighbor caches. Default is 3130. To disable use
- "0". May be overridden with -u on the command line.
-DOC_END
-
-NAME: htcp_port
-IFDEF: USE_HTCP
-TYPE: ushort
-DEFAULT: 4827
-LOC: Config.Port.htcp
-DOC_START
- The port number where Squid sends and receives HTCP queries to
- and from neighbor caches. Default is 4827. To disable use
- "0".
-DOC_END
-
-NAME: mcast_groups
-TYPE: wordlist
-LOC: Config.mcast_group_list
-DEFAULT: none
-DOC_START
- This tag specifies a list of multicast groups which your server
- should join to receive multicasted ICP queries.
-
- NOTE! Be very careful what you put here! Be sure you
- understand the difference between an ICP _query_ and an ICP
- _reply_. This option is to be set only if you want to RECEIVE
- multicast queries. Do NOT set this option to SEND multicast
- ICP (use cache_peer for that). ICP replies are always sent via
- unicast, so this option does not affect whether or not you will
- receive replies from multicast group members.
-
- You must be very careful to NOT use a multicast address which
- is already in use by another group of caches.
-
- If you are unsure about multicast, please read the Multicast
- chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-
- Usage: mcast_groups 239.128.16.128 224.0.1.20
-
- By default, Squid doesn't listen on any multicast groups.
-DOC_END
-
-NAME: udp_incoming_address
-TYPE: address
-LOC:Config.Addrs.udp_incoming
-DEFAULT: 0.0.0.0
-DOC_NONE
-
-NAME: udp_outgoing_address
-TYPE: address
-LOC: Config.Addrs.udp_outgoing
-DEFAULT: 255.255.255.255
-DOC_START
- udp_incoming_address is used for the ICP socket receiving packets
- from other caches.
- udp_outgoing_address is used for ICP packets sent out to other
- caches.
-
- The default behavior is to not bind to any specific address.
-
- A udp_incoming_address value of 0.0.0.0 indicates Squid
- should listen for UDP messages on all available interfaces.
-
- If udp_outgoing_address is set to 255.255.255.255 (the default)
- it will use the same socket as udp_incoming_address. Only
- change this if you want to have ICP queries sent using another
- address than where this Squid listens for ICP queries from other
- caches.
-
- NOTE, udp_incoming_address and udp_outgoing_address can not
- have the same value since they both use port 3130.
-DOC_END
-
COMMENT_START
OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-----------------------------------------------------------------------------
@@ -424,27 +355,29 @@
DOC_START
To specify other caches in a hierarchy, use the format:
- cache_peer hostname type http_port icp_port [options]
+ cache_peer hostname type http-port icp-port [options]
For example,
# proxy icp
# hostname type port port options
# -------------------- -------- ----- ----- -----------
- cache_peer parent.foo.net parent 3128 3130 [proxy-only]
- cache_peer sib1.foo.net sibling 3128 3130 [proxy-only]
- cache_peer sib2.foo.net sibling 3128 3130 [proxy-only]
+ cache_peer parent.foo.net parent 3128 3130 proxy-only default
+ cache_peer sib1.foo.net sibling 3128 3130 proxy-only
+ cache_peer sib2.foo.net sibling 3128 3130 proxy-only
type: either 'parent', 'sibling', or 'multicast'.
- proxy_port: The port number where the cache listens for proxy
+ proxy-port: The port number where the cache listens for proxy
requests.
- icp_port: Used for querying neighbor caches about
+ icp-port: Used for querying neighbor caches about
objects. To have a non-ICP neighbor
specify '7' for the ICP port and make sure the
neighbor machine has the UDP echo port
enabled in its /etc/inetd.conf file.
+ NOTE: Also requires icp_port option enabled to send/receive
+ requests via this method.
options: proxy-only
weight=n
@@ -452,6 +385,7 @@
no-query
default
round-robin
+ carp
multicast-responder
closest-only
no-digest
@@ -464,7 +398,6 @@
max-conn=n
htcp
htcp-oldsquid
- carp-load-factor
originserver
userhash
sourcehash
@@ -473,7 +406,6 @@
monitorsize=sizespec
monitorinterval=seconds
monitortimeout=seconds
- group=name
forceddomain=name
ssl
sslcert=/path/to/ssl/certificate
@@ -487,9 +419,12 @@
use 'proxy-only' to specify objects fetched
from this cache should not be saved locally.
- use 'weight=n' to specify a weighted parent.
- The weight must be an integer. The default weight
- is 1, larger weights are favored more.
+ use 'weight=n' to affect the selection of a peer
+ during any weighted peer-selection mechanisms.
+ The weight must be an integer; default is 1,
+ larger weights are favored more.
+ This option does not affect parent selection if a peering
+ protocol is not in use.
use 'ttl=n' to specify a IP multicast TTL to use
when sending an ICP queries to this address.
@@ -502,14 +437,19 @@
neighbor.
use 'default' if this is a parent cache which can
- be used as a "last-resort." You should probably
- only use 'default' in situations where you cannot
- use ICP with your parent cache(s).
+ be used as a "last-resort" if a peer cannot be located
+ by any of the peer-selection mechanisms.
+ If specified more than once, only the first is used.
use 'round-robin' to define a set of parents which
should be used in a round-robin fashion in the
absence of any ICP queries.
+ use 'carp' to define a set of parents which should
+ be used as a CARP array. The requests will be
+ distributed among the parents based on the CARP load
+ balancing hash function based on their weight.
+
'multicast-responder' indicates the named peer
is a member of a multicast group. ICP queries will
not be sent directly to the peer, but ICP replies
@@ -533,12 +473,16 @@
Note: The string can include URL escapes (i.e. %20 for
spaces). This also means % must be written as %%.
- use 'login=PASS' to forward authentication to the peer.
- Needed if the peer requires login.
+ use 'login=PASS' if users must authenticate against
+ the upstream proxy or in the case of a reverse proxy
+ configuration, the origin web server. This will pass
+ the users credentials as they are to the peer.
Note: To combine this with local authentication the Basic
authentication scheme must be used, and both servers must
share the same user database as HTTP only allows for
a single login (one for proxy, one for origin server).
+ Also be warned this will expose your users proxy
+ password to the peer. USE WITH CAUTION
use 'login=*:password' to pass the username to the
upstream cache, but with a fixed password. This is meant
@@ -576,22 +520,17 @@
use 'htcp-oldsquid' to send HTCP to old Squid versions
- use 'carp-load-factor=f' to define a parent
- cache as one participating in a CARP array.
- The 'f' values for all CARP parents must add
- up to 1.0.
-
'originserver' causes this parent peer to be contacted as
a origin server. Meant to be used in accelerator setups.
use 'userhash' to load-balance amongst a set of parents
based on the client proxy_auth or ident username.
- use 'sourcehash' to load-balanse amongs a set of parents
+ use 'sourcehash' to load-balance amongst a set of parents
based on the client source ip.
use 'name=xxx' if you have multiple peers on the same
- host but different ports. This name can then be used to
+ host but different ports. This name can be used to
differentiate the peers in cache_peer_access and similar
directives.
@@ -617,7 +556,7 @@
name and using redirectors to feed this domain name
is not feasible.
- use 'ssl' to indicate that connections to this peer should
+ use 'ssl' to indicate connections to this peer should
be SSL/TLS encrypted.
use 'sslcert=/path/to/ssl/certificate' to specify a client
@@ -625,7 +564,7 @@
use 'sslkey=/path/to/ssl/key' to specify the private SSL
key corresponding to sslcert above. If 'sslkey' is not
- specified then 'sslcert' is assumed to reference a
+ specified 'sslcert' is assumed to reference a
combined file containing both the certificate and the key.
use sslversion=1|2|3|4 to specify the SSL version to use
@@ -673,7 +612,7 @@
use front-end-https to enable the "Front-End-Https: On"
header needed when using Squid as a SSL frontend in front
of Microsoft OWA. See MS KB document Q307347 for details
- on this header. If set to auto then the header will
+ on this header. If set to auto the header will
only be added if the request is forwarded as a https://
URL.
@@ -682,8 +621,6 @@
and any such challenges received from there should be
ignored. Default is auto to automatically determine the
status of the peer.
-
- NOTE: non-ICP/HTCP neighbors must be specified as 'parent'.
DOC_END
NAME: cache_peer_domain cache_host_domain
@@ -738,49 +675,6 @@
neighbor_type_domain cache.foo.org sibling .au .de
DOC_END
-NAME: icp_query_timeout
-COMMENT: (msec)
-DEFAULT: 0
-TYPE: int
-LOC: Config.Timeout.icp_query
-DOC_START
- Normally Squid will automatically determine an optimal ICP
- query timeout value based on the round-trip-time of recent ICP
- queries. If you want to override the value determined by
- Squid, set this 'icp_query_timeout' to a non-zero value. This
- value is specified in MILLISECONDS, so, to use a 2-second
- timeout (the old default), you would write:
-
- icp_query_timeout 2000
-DOC_END
-
-NAME: maximum_icp_query_timeout
-COMMENT: (msec)
-DEFAULT: 2000
-TYPE: int
-LOC: Config.Timeout.icp_query_max
-DOC_START
- Normally the ICP query timeout is determined dynamically. But
- sometimes it can lead to very large values (say 5 seconds).
- Use this option to put an upper limit on the dynamic timeout
- value. Do NOT use this option to always use a fixed (instead
- of a dynamic) timeout value. To set a fixed timeout see the
- 'icp_query_timeout' directive.
-DOC_END
-
-NAME: mcast_icp_query_timeout
-COMMENT: (msec)
-DEFAULT: 2000
-TYPE: int
-LOC: Config.Timeout.mcast_icp_query
-DOC_START
- For multicast peers, Squid regularly sends out ICP "probes" to
- count how many other peers are listening on the given multicast
- address. This value specifies how long Squid should wait to
- count all the replies. The default is 2000 msec, or 2
- seconds.
-DOC_END
-
NAME: dead_peer_timeout
COMMENT: (seconds)
DEFAULT: 10 seconds
@@ -839,35 +733,22 @@
NOCOMMENT_END
DOC_END
-NAME: cache_vary
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.cache_vary
-DOC_START
- Set to off to disable caching of Vary:in objects.
-DOC_END
-
-NAME: broken_vary_encoding
-TYPE: acl_access
+NAME: wais_relay_host
+TYPE: string
DEFAULT: none
-LOC: Config.accessList.vary_encoding
-DOC_START
- Many servers have broken support for on-the-fly Content-Encoding,
- returning the same ETag on both plain and gzip:ed variants.
- Vary replies matching this access list will have the cache split
- on the Accept-Encoding header of the request and not trusting the
- ETag to be unique.
+LOC: Config.Wais.relayHost
+DOC_NONE
-NOCOMMENT_START
-# Apache mod_gzip and mod_deflate known to be broken so don't trust
-# Apache to signal ETag correctly on such responses
-acl apache rep_header Server ^Apache
-broken_vary_encoding allow apache
-NOCOMMENT_END
+NAME: wais_relay_port
+TYPE: ushort
+DEFAULT: 0
+LOC: Config.Wais.relayPort
+DOC_START
+ Relay WAIS request to host (1st arg) at port (2 arg).
DOC_END
COMMENT_START
- OPTIONS WHICH AFFECT THE CACHE SIZE
+ MEMORY CACHE OPTIONS
-----------------------------------------------------------------------------
COMMENT_END
@@ -908,61 +789,6 @@
objects.
DOC_END
-NAME: cache_swap_low
-COMMENT: (percent, 0-100)
-TYPE: int
-DEFAULT: 90
-LOC: Config.Swap.lowWaterMark
-DOC_NONE
-
-NAME: cache_swap_high
-COMMENT: (percent, 0-100)
-TYPE: int
-DEFAULT: 95
-LOC: Config.Swap.highWaterMark
-DOC_START
-
- The low- and high-water marks for cache object replacement.
- Replacement begins when the swap (disk) usage is above the
- low-water mark and attempts to maintain utilization near the
- low-water mark. As swap utilization gets close to high-water
- mark object eviction becomes more aggressive. If utilization is
- close to the low-water mark less replacement is done each time.
-
- Defaults are 90% and 95%. If you have a large cache, 5% could be
- hundreds of MB. If this is the case you may wish to set these
- numbers closer together.
-DOC_END
-
-NAME: maximum_object_size
-COMMENT: (bytes)
-TYPE: b_size_t
-DEFAULT: 4096 KB
-LOC: Config.Store.maxObjectSize
-DOC_START
- Objects larger than this size will NOT be saved on disk. The
- value is specified in kilobytes, and the default is 4MB. If
- you wish to get a high BYTES hit ratio, you should probably
- increase this (one 32 MB object hit counts for 3200 10KB
- hits). If you wish to increase speed more than your want to
- save bandwidth you should leave this low.
-
- NOTE: if using the LFUDA replacement policy you should increase
- this value to maximize the byte hit rate improvement of LFUDA!
- See replacement_policy below for a discussion of this policy.
-DOC_END
-
-NAME: minimum_object_size
-COMMENT: (bytes)
-TYPE: b_size_t
-DEFAULT: 0 KB
-LOC: Config.Store.minObjectSize
-DOC_START
- Objects smaller than this size will NOT be saved on disk. The
- value is specified in kilobytes, and the default is 0 KB, which
- means there is no minimum.
-DOC_END
-
NAME: maximum_object_size_in_memory
COMMENT: (bytes)
TYPE: b_size_t
@@ -975,91 +801,19 @@
enough to keep larger objects from hoarding cache_mem.
DOC_END
-NAME: ipcache_size
-COMMENT: (number of entries)
-TYPE: int
-DEFAULT: 1024
-LOC: Config.ipcache.size
-DOC_NONE
-
-NAME: ipcache_low
-COMMENT: (percent)
-TYPE: int
-DEFAULT: 90
-LOC: Config.ipcache.low
-DOC_NONE
-
-NAME: ipcache_high
-COMMENT: (percent)
-TYPE: int
-DEFAULT: 95
-LOC: Config.ipcache.high
+NAME: memory_replacement_policy
+TYPE: removalpolicy
+LOC: Config.memPolicy
+DEFAULT: lru
DOC_START
- The size, low-, and high-water marks for the IP cache.
-DOC_END
-
-NAME: fqdncache_size
-COMMENT: (number of entries)
-TYPE: int
-DEFAULT: 1024
-LOC: Config.fqdncache.size
-DOC_START
- Maximum number of FQDN cache entries.
-DOC_END
-
-NAME: cache_replacement_policy
-TYPE: removalpolicy
-LOC: Config.replPolicy
-DEFAULT: lru
-DOC_START
- The cache replacement policy parameter determines which
- objects are evicted (replaced) when disk space is needed.
-
- lru : Squid's original list based LRU policy
- heap GDSF : Greedy-Dual Size Frequency
- heap LFUDA: Least Frequently Used with Dynamic Aging
- heap LRU : LRU policy implemented using a heap
-
- Applies to any cache_dir lines listed below this.
-
- The LRU policies keeps recently referenced objects.
-
- The heap GDSF policy optimizes object hit rate by keeping smaller
- popular objects in cache so it has a better chance of getting a
- hit. It achieves a lower byte hit rate than LFUDA though since
- it evicts larger (possibly popular) objects.
-
- The heap LFUDA policy keeps popular objects in cache regardless of
- their size and thus optimizes byte hit rate at the expense of
- hit rate since one large, popular object will prevent many
- smaller, slightly less popular objects from being cached.
-
- Both policies utilize a dynamic aging mechanism that prevents
- cache pollution that can otherwise occur with frequency-based
- replacement policies.
-
- NOTE: if using the LFUDA replacement policy you should increase
- the value of maximum_object_size above its default of 4096 KB to
- to maximize the potential byte hit rate improvement of LFUDA.
-
- For more information about the GDSF and LFUDA cache replacement
- policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
- and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-DOC_END
-
-NAME: memory_replacement_policy
-TYPE: removalpolicy
-LOC: Config.memPolicy
-DEFAULT: lru
-DOC_START
- The memory replacement policy parameter determines which
- objects are purged from memory when memory space is needed.
+ The memory replacement policy parameter determines which
+ objects are purged from memory when memory space is needed.
See cache_replacement_policy for details.
DOC_END
COMMENT_START
- LOGFILE PATHNAMES AND CACHE DIRECTORIES
+ DISK CACHE OPTIONS
-----------------------------------------------------------------------------
COMMENT_END
@@ -1086,7 +840,7 @@
The directory must exist and be writable by the Squid
process. Squid will NOT create this directory for you.
Only using COSS, a raw disk device or a stripe file can
- be specified, but the configuration of the "cache_wap_log"
+ be specified, but the configuration of the "cache_swap_log"
tag is mandatory.
The ufs store type:
@@ -1143,7 +897,7 @@
higher hit ratio at the expense of an increase in response
time.
- The COSS store type:
+ The coss store type:
block-size=n defines the "block size" for COSS cache_dir's.
Squid uses file numbers as block numbers. Since file numbers
@@ -1190,9 +944,13 @@
2 full stripes for object hits. (ie a COSS cache_dir will reject
new objects when the number of full stripes is 2 less than maxfullbufs)
+ The null store type:
+
+ no options are allowed or required
+
Common options:
- read-only, this cache_dir is read only.
+ read-only, no new objects should be stored to this cache_dir
min-size=n, refers to the min object size this storedir will accept.
It's used to restrict a storedir to only store large objects
@@ -1209,6 +967,126 @@
(hard coded at 1 MB).
DOC_END
+NAME: store_dir_select_algorithm
+TYPE: string
+LOC: Config.store_dir_select_algorithm
+DEFAULT: least-load
+DOC_START
+ Set this to 'round-robin' as an alternative.
+DOC_END
+
+NAME: max_open_disk_fds
+TYPE: int
+LOC: Config.max_open_disk_fds
+DEFAULT: 0
+DOC_START
+ To avoid having disk as the I/O bottleneck Squid can optionally
+ bypass the on-disk cache if more than this amount of disk file
+ descriptors are open.
+
+ A value of 0 indicates no limit.
+DOC_END
+
+NAME: cache_replacement_policy
+TYPE: removalpolicy
+LOC: Config.replPolicy
+DEFAULT: lru
+DOC_START
+ The cache replacement policy parameter determines which
+ objects are evicted (replaced) when disk space is needed.
+
+ lru : Squid's original list based LRU policy
+ heap GDSF : Greedy-Dual Size Frequency
+ heap LFUDA: Least Frequently Used with Dynamic Aging
+ heap LRU : LRU policy implemented using a heap
+
+ Applies to any cache_dir lines listed below this.
+
+ The LRU policies keeps recently referenced objects.
+
+ The heap GDSF policy optimizes object hit rate by keeping smaller
+ popular objects in cache so it has a better chance of getting a
+ hit. It achieves a lower byte hit rate than LFUDA though since
+ it evicts larger (possibly popular) objects.
+
+ The heap LFUDA policy keeps popular objects in cache regardless of
+ their size and thus optimizes byte hit rate at the expense of
+ hit rate since one large, popular object will prevent many
+ smaller, slightly less popular objects from being cached.
+
+ Both policies utilize a dynamic aging mechanism that prevents
+ cache pollution that can otherwise occur with frequency-based
+ replacement policies.
+
+ NOTE: if using the LFUDA replacement policy you should increase
+ the value of maximum_object_size above its default of 4096 KB to
+ to maximize the potential byte hit rate improvement of LFUDA.
+
+ For more information about the GDSF and LFUDA cache replacement
+ policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
+ and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
+DOC_END
+
+NAME: minimum_object_size
+COMMENT: (bytes)
+TYPE: b_size_t
+DEFAULT: 0 KB
+LOC: Config.Store.minObjectSize
+DOC_START
+ Objects smaller than this size will NOT be saved on disk. The
+ value is specified in kilobytes, and the default is 0 KB, which
+ means there is no minimum.
+DOC_END
+
+NAME: maximum_object_size
+COMMENT: (bytes)
+TYPE: b_size_t
+DEFAULT: 4096 KB
+LOC: Config.Store.maxObjectSize
+DOC_START
+ Objects larger than this size will NOT be saved on disk. The
+ value is specified in kilobytes, and the default is 4MB. If
+ you wish to get a high BYTES hit ratio, you should probably
+ increase this (one 32 MB object hit counts for 3200 10KB
+ hits). If you wish to increase speed more than your want to
+ save bandwidth you should leave this low.
+
+ NOTE: if using the LFUDA replacement policy you should increase
+ this value to maximize the byte hit rate improvement of LFUDA!
+ See replacement_policy below for a discussion of this policy.
+DOC_END
+
+NAME: cache_swap_low
+COMMENT: (percent, 0-100)
+TYPE: int
+DEFAULT: 90
+LOC: Config.Swap.lowWaterMark
+DOC_NONE
+
+NAME: cache_swap_high
+COMMENT: (percent, 0-100)
+TYPE: int
+DEFAULT: 95
+LOC: Config.Swap.highWaterMark
+DOC_START
+
+ The low- and high-water marks for cache object replacement.
+ Replacement begins when the swap (disk) usage is above the
+ low-water mark and attempts to maintain utilization near the
+ low-water mark. As swap utilization gets close to high-water
+ mark object eviction becomes more aggressive. If utilization is
+ close to the low-water mark less replacement is done each time.
+
+ Defaults are 90% and 95%. If you have a large cache, 5% could be
+ hundreds of MB. If this is the case you may wish to set these
+ numbers closer together.
+DOC_END
+
+COMMENT_START
+ LOGFILE OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
NAME: logformat
TYPE: logformat
LOC: Config.Log.logformats
@@ -1236,7 +1114,7 @@
' output as-is
- left aligned
- width field width. If starting with 0 then the
+ width field width. If starting with 0 the
output is zero padded
{arg} argument such as header name etc
@@ -1260,10 +1138,10 @@
h
un User name
- ul User login
- ui User ident
- us User SSL
- ue User external acl
+ ul User name from authentication
+ ui User name from ident
+ us User name from SSL
+ ue User name from external acl helper
Hs HTTP status code
Ss Squid request status (TCP_MISS etc)
Sh Squid hierarchy status (DEFAULT_PARENT etc)
@@ -1288,19 +1166,30 @@
LOC: Config.Log.accesslogs
DEFAULT: none
DOC_START
- These files log client request activities. Has a line every HTTP or
- ICP request. The format is:
- access_log [ [acl acl ...]]
-
- Will log to the specified file using the specified format (which
- must be defined in a logformat directive) those entries which match
- ALL the acl's specified (which must be defined in acl clauses).
- If no acl is specified, all requests will be logged to this file.
+ These files log client request activities. Has a line every HTTP or
+ ICP request. The format is:
+ access_log [ [acl acl ...]]
+ access_log none [acl acl ...]]
+
+ Will log to the specified file using the specified format (which
+ must be defined in a logformat directive) those entries which match
+ ALL the acl's specified (which must be defined in acl clauses).
+ If no acl is specified, all requests will be logged to this file.
+
+ To disable logging of a request use the filepath "none", in which case
+ a logformat name should not be specified.
+
+ To log the request via syslog specify a filepath of "syslog":
+
+ access_log syslog[:facility.priority] [format [acl1 [acl2 ....]]]
+ where facility could be any of:
+ authpriv, daemon, local0 .. local7 or user.
- To disable logging of a request use the filepath "none", in which case
- a logformat name should not be specified.
+ And priority could be any of:
+ err, warning, notice, info, debug.
- To log the request via syslog specify a filepath of "syslog"
+ Note: 2.6.STABLE14 and earlier only supports a slightly different
+ and undocumented format with all uppercase LOG_FACILITY|LOG_PRIORITY
NOCOMMENT_START
access_log @DEFAULT_ACCESS_LOG@ squid
NOCOMMENT_END
@@ -1333,7 +1222,7 @@
LOC: Config.Log.swap
DEFAULT: none
DOC_START
- Location for the cache "swap.state" file. This log file holds
+ Location for the cache "swap.state" file. This index 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
@@ -1356,10 +1245,30 @@
The numbered extension (which is added automatically)
corresponds to the order of the 'cache_dir' lines in this
configuration file. If you change the order of the 'cache_dir'
- lines in this file, these log files will NOT correspond to
+ lines in this file, these index files will NOT correspond to
the correct 'cache_dir' entry (unless you manually rename
them). We recommend you do NOT use this option. It is
- better to keep these log files in each 'cache_dir' directory.
+ better to keep these index files in each 'cache_dir' directory.
+DOC_END
+
+NAME: logfile_rotate
+TYPE: int
+DEFAULT: 10
+LOC: Config.Log.rotateNumber
+DOC_START
+ Specifies the number of logfile rotations to make when you
+ type 'squid -k rotate'. The default is 10, which will rotate
+ with extensions 0 through 9. Setting logfile_rotate to 0 will
+ disable the file name rotation, but the logfiles are still closed
+ and re-opened. This will enable you to rename the logfiles
+ yourself just before sending the rotate signal.
+
+ Note, the 'squid -k rotate' command normally sends a USR1
+ signal to the running squid process. In certain situations
+ (e.g. on Linux with Async I/O), USR1 is used for other
+ purposes, so -k rotate uses another signal. It is best to get
+ in the habit of using 'squid -k rotate' instead of 'kill -USR1
+ '.
DOC_END
NAME: emulate_httpd_log
@@ -1478,6 +1387,39 @@
the last digit set to '0'.
DOC_END
+NAME: forward_log
+IFDEF: WIP_FWD_LOG
+TYPE: string
+DEFAULT: none
+LOC: Config.Log.forward
+DOC_START
+ Logs the server-side requests.
+
+ This is currently work in progress.
+DOC_END
+
+NAME: strip_query_terms
+TYPE: onoff
+LOC: Config.onoff.strip_query_terms
+DEFAULT: on
+DOC_START
+ By default, Squid strips query terms from requested URLs before
+ logging. This protects your user's privacy.
+DOC_END
+
+NAME: buffered_logs
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.buffered_logs
+DOC_START
+ cache.log log file is written with stdio functions, and as such
+ it can be buffered or unbuffered. By default it will be unbuffered.
+ Buffering it can speed up the writing slightly (though you are
+ unlikely to need to worry unless you run with tons of debugging
+ enabled in which case performance will suffer badly anyway..).
+DOC_END
+
COMMENT_START
OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-----------------------------------------------------------------------------
@@ -1547,145 +1489,23 @@
is broken and does not follow the FTP standard.
DOC_END
-NAME: check_hostnames
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.check_hostnames
+NAME: diskd_program
+TYPE: string
+DEFAULT: @DEFAULT_DISKD@
+LOC: Config.Program.diskd
DOC_START
- For security and stability reasons Squid by default checks
- hostnames for Internet standard RFC compliance. If you do not want
- Squid to perform these checks then turn this directive off.
+ Specify the location of the diskd executable.
+ Note this is only useful if you have compiled in
+ diskd as one of the store io modules.
DOC_END
-NAME: allow_underscore
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.allow_underscore
+NAME: unlinkd_program
+IFDEF: USE_UNLINKD
+TYPE: string
+DEFAULT: @DEFAULT_UNLINKD@
+LOC: Config.Program.unlinkd
DOC_START
- Underscore characters is not strictly allowed in Internet hostnames
- but nevertheless used by many sites. Set this to off if you want
- Squid to be strict about the standard.
-DOC_END
-
-NAME: cache_dns_program
-TYPE: string
-IFDEF: USE_DNSSERVERS
-DEFAULT: @DEFAULT_DNSSERVER@
-LOC: Config.Program.dnsserver
-DOC_START
- Specify the location of the executable for dnslookup process.
-DOC_END
-
-NAME: dns_children
-TYPE: int
-IFDEF: USE_DNSSERVERS
-DEFAULT: 5
-LOC: Config.dnsChildren
-DOC_START
- The number of processes spawn to service DNS name lookups.
- For heavily loaded caches on large servers, you should
- probably increase this value to at least 10. The maximum
- is 32. The default is 5.
-
- You must have at least one dnsserver process.
-DOC_END
-
-NAME: dns_retransmit_interval
-TYPE: time_t
-DEFAULT: 5 seconds
-LOC: Config.Timeout.idns_retransmit
-IFDEF: !USE_DNSSERVERS
-DOC_START
- Initial retransmit interval for DNS queries. The interval is
- doubled each time all configured DNS servers have been tried.
-
-DOC_END
-
-NAME: dns_timeout
-TYPE: time_t
-DEFAULT: 2 minutes
-LOC: Config.Timeout.idns_query
-IFDEF: !USE_DNSSERVERS
-DOC_START
- DNS Query timeout. If no response is received to a DNS query
- within this time all DNS servers for the queried domain
- are assumed to be unavailable.
-DOC_END
-
-NAME: dns_defnames
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: off
-LOC: Config.onoff.res_defnames
-DOC_START
- Normally the RES_DEFNAMES resolver option is disabled
- (see res_init(3)). This prevents caches in a hierarchy
- from interpreting single-component hostnames locally. To allow
- Squid to handle single-component names, enable this option.
-DOC_END
-
-NAME: dns_nameservers
-TYPE: wordlist
-DEFAULT: none
-LOC: Config.dns_nameservers
-DOC_START
- Use this if you want to specify a list of DNS name servers
- (IP addresses) to use instead of those given in your
- /etc/resolv.conf file.
- On Windows platforms, if no value is specified here or in
- the /etc/resolv.conf file, the list of DNS name servers are
- taken from the Windows registry, both static and dynamic DHCP
- configurations are supported.
-
- Example: dns_nameservers 10.0.0.1 192.172.0.4
-DOC_END
-
-NAME: hosts_file
-TYPE: string
-DEFAULT: @DEFAULT_HOSTS@
-LOC: Config.etcHostsPath
-DOC_START
- Location of the host-local IP name-address associations
- database. Most Operating Systems have such a file on different
- default locations:
- - Un*X & Linux: /etc/hosts
- - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
- (%SystemRoot% value install default is c:\winnt)
- - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
- (%SystemRoot% value install default is c:\windows)
- - Windows 9x/Me: %windir%\hosts
- (%windir% value is usually c:\windows)
- - Cygwin: /etc/hosts
-
- The file contains newline-separated definitions, in the
- form ip_address_in_dotted_form name [name ...] names are
- whitespace-separated. Lines beginning with an hash (#)
- character are comments.
-
- The file is checked at startup and upon configuration.
- If set to 'none', it won't be checked.
- If append_domain is used, that domain will be added to
- domain-local (i.e. not containing any dot character) host
- definitions.
-DOC_END
-
-NAME: diskd_program
-TYPE: string
-DEFAULT: @DEFAULT_DISKD@
-LOC: Config.Program.diskd
-DOC_START
- Specify the location of the diskd executable.
- Note that this is only useful if you have compiled in
- diskd as one of the store io modules.
-DOC_END
-
-NAME: unlinkd_program
-IFDEF: USE_UNLINKD
-TYPE: string
-DEFAULT: @DEFAULT_UNLINKD@
-LOC: Config.Program.unlinkd
-DOC_START
- Specify the location of the executable for file deletion process.
+ Specify the location of the executable for file deletion process.
DOC_END
NAME: pinger_program
@@ -1740,8 +1560,8 @@
LOC: Config.Program.url_rewrite.concurrency
DOC_START
The number of requests each redirector helper can handle in
- parallel. Defaults to 0 which indicates that the redirector
- is a old-style singlethreaded redirector.
+ parallel. Defaults to 0 which indicates the redirector
+ is a old-style single threaded redirector.
DOC_END
NAME: url_rewrite_host_header redirect_rewrites_host_header
@@ -2148,6 +1968,7 @@
FORMAT specifications
%LOGIN Authenticated user login name
+ %EXT_USER Username from external acl
%IDENT Ident user name
%SRC Client IP
%SRCPORT Client source port
@@ -2172,9 +1993,9 @@
%DATA The ACL arguments. If not used then any arguments
is automatically added at the end
- The request sent to the helper consists of the data in the format
- specification in the order specified, plus any values specified in
- the referencing acl (see the "acl external" directive).
+ In addition to the above, any string specified in the referencing
+ acl will also be included in the helper request line, after the
+ specified formats (see the "acl external" directive)
The helper receives lines per the above format specification,
and returns lines starting with OK or ERR indicating the validity
@@ -2217,21 +2038,6 @@
-----------------------------------------------------------------------------
COMMENT_END
-NAME: wais_relay_host
-TYPE: string
-DEFAULT: none
-LOC: Config.Wais.relayHost
-DOC_NONE
-
-NAME: wais_relay_port
-TYPE: ushort
-DEFAULT: 0
-LOC: Config.Wais.relayPort
-DOC_START
- Relay WAIS request to host (1st arg) at port (2 arg).
-DOC_END
-
-
NAME: request_header_max_size
COMMENT: (KB)
TYPE: b_size_t
@@ -2438,7 +2244,7 @@
DEFAULT: 1 minute
DOC_START
Time-to-Live (TTL) for negative caching of failed DNS lookups.
- This also makes sets the lower cache limit on positive lookups.
+ This also sets the lower cache limit on positive lookups.
Minimum value is 1 second, and it is not recommendable to go
much below 10 seconds.
DOC_END
@@ -2465,6 +2271,106 @@
client requested. (default)
DOC_END
+NAME: minimum_expiry_time
+COMMENT: (seconds)
+TYPE: time_t
+LOC: Config.minimum_expiry_time
+DEFAULT: 60 seconds
+DOC_START
+ The minimum caching time according to (Expires - Date)
+ Headers Squid honors if the object can't be revalidated
+ defaults to 60 seconds. In reverse proxy enorinments it
+ might be desirable to honor shorter object lifetimes. It
+ is most likely better to make your server return a
+ meaningful Last-Modified header however.
+DOC_END
+
+NAME: store_avg_object_size
+COMMENT: (kbytes)
+TYPE: kb_size_t
+DEFAULT: 13 KB
+LOC: Config.Store.avgObjectSize
+DOC_START
+ Average object size, used to estimate number of objects your
+ cache can hold. The default is 13 KB.
+DOC_END
+
+NAME: store_objects_per_bucket
+TYPE: int
+DEFAULT: 20
+LOC: Config.Store.objectsPerBucket
+DOC_START
+ Target number of objects per bucket in the store hash table.
+ Lowering this value increases the total number of buckets and
+ also the storage maintenance rate. The default is 20.
+DOC_END
+
+COMMENT_START
+ HTTP OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: broken_posts
+TYPE: acl_access
+DEFAULT: none
+LOC: Config.accessList.brokenPosts
+DOC_START
+ A list of ACL elements which, if matched, causes Squid to send
+ an extra CRLF pair after the body of a PUT/POST request.
+
+ Some HTTP servers has broken implementations of PUT/POST,
+ and rely on an extra CRLF pair sent by some WWW clients.
+
+ Quote from RFC2616 section 4.1 on this matter:
+
+ Note: certain buggy HTTP/1.0 client implementations generate an
+ extra CRLF's after a POST request. To restate what is explicitly
+ forbidden by the BNF, an HTTP/1.1 client must not preface or follow
+ a request with an extra CRLF.
+
+Example:
+ acl buggy_server url_regex ^http://....
+ broken_posts allow buggy_server
+DOC_END
+
+NAME: via
+IFDEF: HTTP_VIOLATIONS
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.via
+DOC_START
+ If set (default), Squid will include a Via header in requests and
+ replies as required by RFC2616.
+DOC_END
+
+NAME: cache_vary
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.cache_vary
+DOC_START
+ Set to off to disable caching of Vary:in objects.
+DOC_END
+
+NAME: broken_vary_encoding
+TYPE: acl_access
+DEFAULT: none
+LOC: Config.accessList.vary_encoding
+DOC_START
+ Many servers have broken support for on-the-fly Content-Encoding,
+ returning the same ETag on both plain and gzip:ed variants.
+ Vary replies matching this access list will have the cache split
+ on the Accept-Encoding header of the request and not trusting the
+ ETag to be unique.
+
+NOCOMMENT_START
+# Apache mod_gzip and mod_deflate known to be broken so don't trust
+# Apache to signal ETag correctly on such responses
+acl apache rep_header Server ^Apache
+broken_vary_encoding allow apache
+NOCOMMENT_END
+DOC_END
+
NAME: collapsed_forwarding
COMMENT: (on|off)
TYPE: onoff
@@ -2492,28 +2398,195 @@
frequently.
DOC_END
-COMMENT_START
- TIMEOUTS
- -----------------------------------------------------------------------------
-COMMENT_END
-
-NAME: forward_timeout
-COMMENT: time-units
-TYPE: time_t
-LOC: Config.Timeout.forward
-DEFAULT: 4 minutes
-DOC_START
- This parameter specifies how long Squid should at most attempt in
- finding a forwarding path for the request before giving up.
-DOC_END
-
-NAME: connect_timeout
-COMMENT: time-units
-TYPE: time_t
-LOC: Config.Timeout.connect
-DEFAULT: 1 minute
+NAME: ie_refresh
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.ie_refresh
+DEFAULT: off
DOC_START
- This parameter specifies how long to wait for the TCP connect to
+ Microsoft Internet Explorer up until version 5.5 Service
+ Pack 1 has an issue with transparent proxies, wherein it
+ is impossible to force a refresh. Turning this on provides
+ a partial fix to the problem, by causing all IMS-REFRESH
+ requests from older IE versions to check the origin server
+ for fresh content. This reduces hit ratio by some amount
+ (~10% in my experience), but allows users to actually get
+ fresh content when they want it. Note because Squid
+ cannot tell if the user is using 5.5 or 5.5SP1, the behavior
+ of 5.5 is unchanged from old versions of Squid (i.e. a
+ forced refresh is impossible). Newer versions of IE will,
+ hopefully, continue to have the new behavior and will be
+ handled based on that assumption. This option defaults to
+ the old Squid behavior, which is better for hit ratios but
+ worse for clients using IE, if they need to be able to
+ force fresh content.
+DOC_END
+
+NAME: vary_ignore_expire
+COMMENT: on|off
+TYPE: onoff
+LOC: Config.onoff.vary_ignore_expire
+DEFAULT: off
+DOC_START
+ Many HTTP servers supporting Vary gives such objects
+ immediate expiry time with no cache-control header
+ when requested by a HTTP/1.0 client. This option
+ enables Squid to ignore such expiry times until
+ HTTP/1.1 is fully implemented.
+ WARNING: This may eventually cause some varying
+ objects not intended for caching to get cached.
+DOC_END
+
+NAME: extension_methods
+TYPE: extension_method
+LOC: RequestMethodStr
+DEFAULT: none
+DOC_START
+ Squid only knows about standardized HTTP request methods.
+ You can add up to 20 additional "extension" methods here.
+DOC_END
+
+NAME: request_entities
+TYPE: onoff
+LOC: Config.onoff.request_entities
+DEFAULT: off
+DOC_START
+ Squid defaults to deny GET and HEAD requests with request entities,
+ as the meaning of such requests are undefined in the HTTP standard
+ even if not explicitly forbidden.
+
+ Set this directive to on if you have clients which insists
+ on sending request entities in GET or HEAD requests. But be warned
+ that there is server software (both proxies and web servers) which
+ can fail to properly process this kind of request which may make you
+ vulnerable to cache pollution attacks if enabled.
+DOC_END
+
+NAME: header_access
+IFDEF: HTTP_VIOLATIONS
+TYPE: http_header_access[]
+LOC: Config.header_access
+DEFAULT: none
+DOC_START
+ Usage: header_access header_name allow|deny [!]aclname ...
+
+ WARNING: Doing this VIOLATES the HTTP standard. Enabling
+ this feature could make you liable for problems which it
+ causes.
+
+ This option replaces the old 'anonymize_headers' and the
+ older 'http_anonymizer' option with something that is much
+ more configurable. This new method creates a list of ACLs
+ for each header, allowing you very fine-tuned header
+ mangling.
+
+ You can only specify known headers for the header name.
+ Other headers are reclassified as 'Other'. You can also
+ refer to all the headers with 'All'.
+
+ For example, to achieve the same behavior as the old
+ 'http_anonymizer standard' option, you should use:
+
+ header_access From deny all
+ header_access Referer deny all
+ header_access Server deny all
+ header_access User-Agent deny all
+ header_access WWW-Authenticate deny all
+ header_access Link deny all
+
+ Or, to reproduce the old 'http_anonymizer paranoid' feature
+ you should use:
+
+ header_access Allow allow all
+ header_access Authorization allow all
+ header_access WWW-Authenticate allow all
+ header_access Proxy-Authorization allow all
+ header_access Proxy-Authenticate allow all
+ header_access Cache-Control allow all
+ header_access Content-Encoding allow all
+ header_access Content-Length allow all
+ header_access Content-Type allow all
+ header_access Date allow all
+ header_access Expires allow all
+ header_access Host allow all
+ header_access If-Modified-Since allow all
+ header_access Last-Modified allow all
+ header_access Location allow all
+ header_access Pragma allow all
+ header_access Accept allow all
+ header_access Accept-Charset allow all
+ header_access Accept-Encoding allow all
+ header_access Accept-Language allow all
+ header_access Content-Language allow all
+ header_access Mime-Version allow all
+ header_access Retry-After allow all
+ header_access Title allow all
+ header_access Connection allow all
+ header_access Proxy-Connection allow all
+ header_access All deny all
+
+ By default, all headers are allowed (no anonymizing is
+ performed).
+DOC_END
+
+NAME: header_replace
+IFDEF: HTTP_VIOLATIONS
+TYPE: http_header_replace[]
+LOC: Config.header_access
+DEFAULT: none
+DOC_START
+ Usage: header_replace header_name message
+ Example: header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
+
+ This option allows you to change the contents of headers
+ denied with header_access above, by replacing them with
+ some fixed string. This replaces the old fake_user_agent
+ option.
+
+ By default, headers are removed if denied.
+DOC_END
+
+NAME: relaxed_header_parser
+COMMENT: on|off|warn
+TYPE: tristate
+LOC: Config.onoff.relaxed_header_parser
+DEFAULT: on
+DOC_START
+ In the default "on" setting Squid accepts certain forms
+ of non-compliant HTTP messages where it is unambiguous
+ what the sending application intended even if the message
+ is not correctly formatted. The messages is then normalized
+ to the correct form when forwarded by Squid.
+
+ If set to "warn" then a warning will be emitted in cache.log
+ each time such HTTP error is encountered.
+
+ If set to "off" then such HTTP errors will cause the request
+ or response to be rejected.
+DOC_END
+
+COMMENT_START
+ TIMEOUTS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: forward_timeout
+COMMENT: time-units
+TYPE: time_t
+LOC: Config.Timeout.forward
+DEFAULT: 4 minutes
+DOC_START
+ This parameter specifies how long Squid should at most attempt in
+ finding a forwarding path for the request before giving up.
+DOC_END
+
+NAME: connect_timeout
+COMMENT: time-units
+TYPE: time_t
+LOC: Config.Timeout.connect
+DEFAULT: 1 minute
+DOC_START
+ This parameter specifies how long to wait for the TCP connect to
the requested server or peer to complete before Squid should
attempt to find another path where to forward the request.
DOC_END
@@ -2673,7 +2746,7 @@
acl aclname dstdomain .foo.com ... # Destination server from URL
acl aclname srcdom_regex [-i] xxx ... # regex matching client name
acl aclname dstdom_regex [-i] xxx ... # regex matching server
- # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
+ # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
# based URL is used and no match is found. The name "none" is used
# if the reverse lookup fails.
@@ -2727,9 +2800,9 @@
# to check username/password combinations (see
# auth_param directive).
#
- # WARNING: proxy_auth can't be used in a transparent proxy. It
- # collides with any authentication done by origin servers. It may
- # seem like it works at first, but it doesn't.
+ # NOTE: proxy_auth can't be used in a transparent proxy as
+ # the browser needs to be configured for using a proxy in order
+ # to respond to proxy authentication.
acl aclname snmp_community string ...
# A community string to limit access to your SNMP Agent
@@ -2775,7 +2848,10 @@
# http_reply_access.
acl aclname rep_header header-name [-i] any\.regex\.here
- # regex match against any of the known response headers.
+ # regex match against any of the known reply headers. May be
+ # thought of as a superset of "browser", "referer" and "mime-type"
+ # ACLs.
+ #
# Example:
#
# acl many_spaces rep_header Content-Disposition -i [[:space:]]{3,}
@@ -2795,10 +2871,11 @@
# match against attributes a users issuing CA SSL certificate
# attribute is one of DN/C/O/CN/L/ST
- acl aclname ext_user username ...
+ acl aclname ext_user username ...
acl aclname ext_user_regex [-i] pattern ...
- # string match on username returned by external acl
- # use REQUIRED to accept any user name.
+ # string match on username returned by external acl helper
+ # use REQUIRED to accept any non-null user name.
+
Examples:
acl macaddress arp 09:00:2b:23:45:67
acl myexample dst_as 1241
@@ -3912,225 +3989,137 @@
DOC_END
COMMENT_START
- MISCELLANEOUS
+ SNMP OPTIONS
-----------------------------------------------------------------------------
COMMENT_END
-NAME: dns_testnames
-TYPE: wordlist
-LOC: Config.dns_testname_list
-DEFAULT: none
-DEFAULT_IF_NONE: netscape.com internic.net nlanr.net microsoft.com
-DOC_START
- The DNS tests exit as soon as the first site is successfully looked up
-
- This test can be disabled with the -D command line option.
-DOC_END
-
-NAME: logfile_rotate
-TYPE: int
-DEFAULT: 10
-LOC: Config.Log.rotateNumber
+NAME: snmp_port
+TYPE: ushort
+LOC: Config.Port.snmp
+DEFAULT: 3401
+IFDEF: SQUID_SNMP
DOC_START
- Specifies the number of logfile rotations to make when you
- type 'squid -k rotate'. The default is 10, which will rotate
- with extensions 0 through 9. Setting logfile_rotate to 0 will
- disable the rotation, but the logfiles are still closed and
- re-opened. This will enable you to rename the logfiles
- yourself just before sending the rotate signal.
-
- Note, the 'squid -k rotate' command normally sends a USR1
- signal to the running squid process. In certain situations
- (e.g. on Linux with Async I/O), USR1 is used for other
- purposes, so -k rotate uses another signal. It is best to get
- in the habit of using 'squid -k rotate' instead of 'kill -USR1
- '.
+ Squid can now serve statistics and status information via SNMP.
+ By default it listens to port 3401 on the machine. If you don't
+ wish to use SNMP, set this to "0".
DOC_END
-NAME: append_domain
-TYPE: string
-LOC: Config.appendDomain
+NAME: snmp_access
+TYPE: acl_access
+LOC: Config.accessList.snmp
DEFAULT: none
+DEFAULT_IF_NONE: deny all
+IFDEF: SQUID_SNMP
DOC_START
- Appends local domain name to hostnames without any dots in
- them. append_domain must begin with a period.
+ Allowing or denying access to the SNMP port.
- Be warned there are now Internet names with no dots in
- them using only top-domain names, so setting this may
- cause some Internet sites to become unavailable.
+ All access to the agent is denied by default.
+ usage:
-Example:
- append_domain .yourdomain.com
-DOC_END
+ snmp_access allow|deny [!]aclname ...
-NAME: tcp_recv_bufsize
-COMMENT: (bytes)
-TYPE: b_size_t
-DEFAULT: 0 bytes
-LOC: Config.tcpRcvBufsz
-DOC_START
- Size of receive buffer to set for TCP sockets. Probably just
- as easy to change your kernel's default. Set to zero to use
- the default buffer size.
+Example:
+ snmp_access allow snmppublic localhost
+ snmp_access deny all
DOC_END
-NAME: error_map
-TYPE: errormap
-LOC: Config.errorMapList
-DEFAULT: none
+NAME: snmp_incoming_address
+TYPE: address
+LOC: Config.Addrs.snmp_incoming
+DEFAULT: 0.0.0.0
+IFDEF: SQUID_SNMP
+DOC_NONE
+NAME: snmp_outgoing_address
+TYPE: address
+LOC: Config.Addrs.snmp_outgoing
+DEFAULT: 255.255.255.255
+IFDEF: SQUID_SNMP
DOC_START
- Map errors to custom messages
-
- error_map message_url http_status ...
-
- http_status ... is a list of HTTP status codes or Squid error
- messages.
-
- Use in accelerators to substitute the error messages returned
- by servers with other custom errors.
-
- error_map http://your.server/error/404.shtml 404
-
- Requests for error messages is a GET request for the configured
- URL with the following special headers
-
- X-Error-Status: The received HTTP status code (i.e. 404)
- X-Request-URI: The requested URI where the error occurred
-
- In Addition the following headers are forwarded from the client
- request:
-
- User-Agent, Cookie, X-Forwarded-For, Via, Authorization,
- Accept, Referer
-
- And the following headers from the server reply:
-
- Server, Via, Location, Content-Location
+ Just like 'udp_incoming_address' above, but for the SNMP port.
- The reply returned to the client will carry the original HTTP
- headers from the real error message, but with the reply body
- of the configured error message.
+ snmp_incoming_address is used for the SNMP socket receiving
+ messages from SNMP agents.
+ snmp_outgoing_address is used for SNMP packets returned to SNMP
+ agents.
-DOC_END
+ The default snmp_incoming_address (0.0.0.0) is to listen on all
+ available network interfaces.
-NAME: err_html_text
-TYPE: eol
-LOC: Config.errHtmlText
-DEFAULT: none
-DOC_START
- HTML text to include in error messages. Make this a "mailto"
- URL to your admin address, or maybe just a link to your
- organizations Web page.
+ If snmp_outgoing_address is set to 255.255.255.255 (the default)
+ it will use the same socket as snmp_incoming_address. Only
+ change this if you want to have SNMP replies sent using another
+ address than where this Squid listens for SNMP queries.
- To include this in your error messages, you must rewrite
- the error template files (found in the "errors" directory).
- Wherever you want the 'err_html_text' line to appear,
- insert a %L tag in the error template file.
+ NOTE, snmp_incoming_address and snmp_outgoing_address can not have
+ the same value since they both use port 3401.
DOC_END
-NAME: deny_info
-TYPE: denyinfo
-LOC: Config.denyInfoList
-DEFAULT: none
-DOC_START
- Usage: deny_info err_page_name acl
- or deny_info http://... acl
- Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-
- This can be used to return a ERR_ page for requests which
- do not pass the 'http_access' rules. A single ACL will cause
- the http_access check to fail. If a 'deny_info' line exists
- for that ACL Squid returns a corresponding error page.
-
- You may use ERR_ pages that come with Squid or create your own pages
- and put them into the configured errors/ directory.
-
- Alternatively you can specify an error URL. The browsers will
- get redirected (302) to the specified URL. %s in the redirection
- URL will be replaced by the requested URL.
-
- Alternatively you can tell Squid to reset the TCP connection
- by specifying TCP_RESET.
-DOC_END
+COMMENT_START
+ ICP OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
-NAME: memory_pools
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.mem_pools
+NAME: icp_port udp_port
+TYPE: ushort
+DEFAULT: @DEFAULT_ICP_PORT@
+LOC: Config.Port.icp
DOC_START
- If set, Squid will keep pools of allocated (but unused) memory
- available for future use. If memory is a premium on your
- system and you believe your malloc library outperforms Squid
- routines, disable this.
+ The port number where Squid sends and receives ICP queries to
+ and from neighbor caches. Default is 3130. To disable use
+ "0". May be overridden with -u on the command line.
DOC_END
-NAME: memory_pools_limit
-COMMENT: (bytes)
-TYPE: b_size_t
-DEFAULT: 5 MB
-LOC: Config.MemPools.limit
+NAME: htcp_port
+IFDEF: USE_HTCP
+TYPE: ushort
+DEFAULT: 4827
+LOC: Config.Port.htcp
DOC_START
- Used only with memory_pools on:
- memory_pools_limit 50 MB
-
- If set to a non-zero value, Squid will keep at most the specified
- limit of allocated (but unused) memory in memory pools. All free()
- requests that exceed this limit will be handled by your malloc
- library. Squid does not pre-allocate any memory, just safe-keeps
- objects that otherwise would be free()d. Thus, it is safe to set
- memory_pools_limit to a reasonably high value even if your
- configuration will use less memory.
-
- If set to zero, Squid will keep all memory it can. That is, there
- will be no limit on the total amount of memory used for safe-keeping.
-
- To disable memory allocation optimization, do not set
- memory_pools_limit to 0. Set memory_pools to "off" instead.
-
- An overhead for maintaining memory pools is not taken into account
- when the limit is checked. This overhead is close to four bytes per
- object kept. However, pools may actually _save_ memory because of
- reduced memory thrashing in your malloc library.
+ The port number where Squid sends and receives HTCP queries to
+ and from neighbor caches. Default is 4827. To disable use
+ "0".
DOC_END
-NAME: via
-IFDEF: HTTP_VIOLATIONS
+NAME: log_icp_queries
COMMENT: on|off
TYPE: onoff
DEFAULT: on
-LOC: Config.onoff.via
+LOC: Config.onoff.log_udp
DOC_START
- If set (default), Squid will include a Via header in requests and
- replies.
+ If set, ICP queries are logged to access.log. You may wish
+ do disable this if your ICP load is VERY high to speed things
+ up or to simplify log analysis.
DOC_END
-NAME: forwarded_for
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: on
-LOC: opt_forwarded_for
+NAME: udp_incoming_address
+TYPE: address
+LOC:Config.Addrs.udp_incoming
+DEFAULT: 0.0.0.0
+DOC_NONE
+
+NAME: udp_outgoing_address
+TYPE: address
+LOC: Config.Addrs.udp_outgoing
+DEFAULT: 255.255.255.255
DOC_START
- If set, Squid will include your system's IP address or name
- in the HTTP requests it forwards. By default it looks like
- this:
+ udp_incoming_address is used for the ICP socket receiving packets
+ from other caches.
+ udp_outgoing_address is used for ICP packets sent out to other
+ caches.
- X-Forwarded-For: 192.1.2.3
+ The default behavior is to not bind to any specific address.
- If you disable this, it will appear as
+ A udp_incoming_address value of 0.0.0.0 indicates Squid
+ should listen for UDP messages on all available interfaces.
- X-Forwarded-For: unknown
-DOC_END
+ If udp_outgoing_address is set to 255.255.255.255 (the default)
+ it will use the same socket as udp_incoming_address. Only
+ change this if you want to have ICP queries sent using another
+ address than where this Squid listens for ICP queries from other
+ caches.
-NAME: log_icp_queries
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.log_udp
-DOC_START
- If set, ICP queries are logged to access.log. You may wish
- do disable this if your ICP load is VERY high to speed things
- up or to simplify log analysis.
+ NOTE, udp_incoming_address and udp_outgoing_address can not
+ have the same value since they both use port 3130.
DOC_END
NAME: icp_hit_stale
@@ -4166,125 +4155,32 @@
which are no more than this many rtt milliseconds away.
DOC_END
-NAME: cachemgr_passwd
-TYPE: cachemgrpasswd
-DEFAULT: none
-LOC: Config.passwd_list
+NAME: netdb_low
+TYPE: int
+DEFAULT: 900
+LOC: Config.Netdb.low
+DOC_NONE
+
+NAME: netdb_high
+TYPE: int
+DEFAULT: 1000
+LOC: Config.Netdb.high
DOC_START
- Specify passwords for cachemgr operations.
+ The low and high water marks for the ICMP measurement
+ database. These are counts, not percents. The defaults are
+ 900 and 1000. When the high water mark is reached, database
+ entries will be deleted until the low mark is reached.
+DOC_END
- Usage: cachemgr_passwd password action action ...
-
- Some valid actions are (see cache manager menu for a full list):
- 5min
- 60min
- asndb
- authenticator
- cbdata
- client_list
- comm_incoming
- config *
- counters
- delay
- digest_stats
- dns
- events
- filedescriptors
- fqdncache
- histograms
- http_headers
- info
- io
- ipcache
- mem
- menu
- netdb
- non_peers
- objects
- offline_toggle *
- pconn
- peer_select
- redirector
- refresh
- server_list
- shutdown *
- store_digest
- storedir
- utilization
- via_headers
- vm_objects
-
- * Indicates actions which will not be performed without a
- valid password, others can be performed if not listed here.
-
- To disable an action, set the password to "disable".
- To allow performing an action without a password, set the
- password to "none".
-
- Use the keyword "all" to set the same password for all actions.
-
-Example:
- cachemgr_passwd secret shutdown
- cachemgr_passwd lesssssssecret info stats/objects
- cachemgr_passwd disable all
-DOC_END
-
-NAME: store_avg_object_size
-COMMENT: (kbytes)
-TYPE: kb_size_t
-DEFAULT: 13 KB
-LOC: Config.Store.avgObjectSize
-DOC_START
- Average object size, used to estimate number of objects your
- cache can hold. The default is 13 KB.
-DOC_END
-
-NAME: store_objects_per_bucket
-TYPE: int
-DEFAULT: 20
-LOC: Config.Store.objectsPerBucket
-DOC_START
- Target number of objects per bucket in the store hash table.
- Lowering this value increases the total number of buckets and
- also the storage maintenance rate. The default is 50.
-DOC_END
-
-NAME: client_db
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.client_db
-DOC_START
- If you want to disable collecting per-client statistics,
- turn off client_db here.
-DOC_END
-
-NAME: netdb_low
-TYPE: int
-DEFAULT: 900
-LOC: Config.Netdb.low
-DOC_NONE
-
-NAME: netdb_high
-TYPE: int
-DEFAULT: 1000
-LOC: Config.Netdb.high
-DOC_START
- The low and high water marks for the ICMP measurement
- database. These are counts, not percents. The defaults are
- 900 and 1000. When the high water mark is reached, database
- entries will be deleted until the low mark is reached.
-DOC_END
-
-NAME: netdb_ping_period
-TYPE: time_t
-LOC: Config.Netdb.period
-DEFAULT: 5 minutes
-DOC_START
- The minimum period for measuring a site. There will be at
- least this much delay between successive pings to the same
- network. The default is five minutes.
-DOC_END
+NAME: netdb_ping_period
+TYPE: time_t
+LOC: Config.Netdb.period
+DEFAULT: 5 minutes
+DOC_START
+ The minimum period for measuring a site. There will be at
+ least this much delay between successive pings to the same
+ network. The default is five minutes.
+DOC_END
NAME: query_icmp
COMMENT: on|off
@@ -4316,197 +4212,130 @@
database, or has a zero RTT.
DOC_END
-NAME: buffered_logs
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: off
-LOC: Config.onoff.buffered_logs
+NAME: icp_query_timeout
+COMMENT: (msec)
+DEFAULT: 0
+TYPE: int
+LOC: Config.Timeout.icp_query
DOC_START
- cache.log log file is written with stdio functions, and as such
- it can be buffered or unbuffered. By default it will be unbuffered.
- Buffering it can speed up the writing slightly (though you are
- unlikely to need to worry unless you run with tons of debugging
- enabled in which case performance will suffer badly anyway..).
+ Normally Squid will automatically determine an optimal ICP
+ query timeout value based on the round-trip-time of recent ICP
+ queries. If you want to override the value determined by
+ Squid, set this 'icp_query_timeout' to a non-zero value. This
+ value is specified in MILLISECONDS, so, to use a 2-second
+ timeout (the old default), you would write:
+
+ icp_query_timeout 2000
DOC_END
-NAME: reload_into_ims
-IFDEF: HTTP_VIOLATIONS
-COMMENT: on|off
-TYPE: onoff
-DEFAULT: off
-LOC: Config.onoff.reload_into_ims
+NAME: maximum_icp_query_timeout
+COMMENT: (msec)
+DEFAULT: 2000
+TYPE: int
+LOC: Config.Timeout.icp_query_max
DOC_START
- When you enable this option, client no-cache or ``reload''
- requests will be changed to If-Modified-Since requests.
- Doing this VIOLATES the HTTP standard. Enabling this
- feature could make you liable for problems which it
- causes.
-
- see also refresh_pattern for a more selective approach.
+ Normally the ICP query timeout is determined dynamically. But
+ sometimes it can lead to very large values (say 5 seconds).
+ Use this option to put an upper limit on the dynamic timeout
+ value. Do NOT use this option to always use a fixed (instead
+ of a dynamic) timeout value. To set a fixed timeout see the
+ 'icp_query_timeout' directive.
DOC_END
-NAME: always_direct
-TYPE: acl_access
-LOC: Config.accessList.AlwaysDirect
+COMMENT_START
+ MULTICAST ICP OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: mcast_groups
+TYPE: wordlist
+LOC: Config.mcast_group_list
DEFAULT: none
DOC_START
- Usage: always_direct allow|deny [!]aclname ...
-
- Here you can use ACL elements to specify requests which should
- ALWAYS be forwarded by Squid to the origin servers without using
- any peers. For example, to always directly forward requests for
- local servers ignoring any parents or siblings you may have use
- something like:
-
- acl local-servers dstdomain my.domain.net
- always_direct allow local-servers
-
- To always forward FTP requests directly, use
-
- acl FTP proto FTP
- always_direct allow FTP
+ This tag specifies a list of multicast groups which your server
+ should join to receive multicasted ICP queries.
- NOTE: There is a similar, but opposite option named
- 'never_direct'. You need to be aware that "always_direct deny
- foo" is NOT the same thing as "never_direct allow foo". You
- may need to use a deny rule to exclude a more-specific case of
- some other rule. Example:
+ NOTE! Be very careful what you put here! Be sure you
+ understand the difference between an ICP _query_ and an ICP
+ _reply_. This option is to be set only if you want to RECEIVE
+ multicast queries. Do NOT set this option to SEND multicast
+ ICP (use cache_peer for that). ICP replies are always sent via
+ unicast, so this option does not affect whether or not you will
+ receive replies from multicast group members.
- acl local-external dstdomain external.foo.net
- acl local-servers dstdomain .foo.net
- always_direct deny local-external
- always_direct allow local-servers
+ You must be very careful to NOT use a multicast address which
+ is already in use by another group of caches.
- NOTE: If your goal is to make the client forward the request
- directly to the origin server bypassing Squid then this needs
- to be done in the client configuration. Squid configuration
- can only tell Squid how Squid should fetch the object.
+ If you are unsure about multicast, please read the Multicast
+ chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
- NOTE: This directive is not related to caching. The replies
- is cached as usual even if you use always_direct. To not cache
- the replies see no_cache.
+ Usage: mcast_groups 239.128.16.128 224.0.1.20
- This option replaces some v1.1 options such as local_domain
- and local_ip.
+ By default, Squid doesn't listen on any multicast groups.
DOC_END
-NAME: never_direct
-TYPE: acl_access
-LOC: Config.accessList.NeverDirect
-DEFAULT: none
+NAME: mcast_miss_addr
+IFDEF: MULTICAST_MISS_STREAM
+TYPE: address
+LOC: Config.mcast_miss.addr
+DEFAULT: 255.255.255.255
DOC_START
- Usage: never_direct allow|deny [!]aclname ...
-
- never_direct is the opposite of always_direct. Please read
- the description for always_direct if you have not already.
-
- With 'never_direct' you can use ACL elements to specify
- requests which should NEVER be forwarded directly to origin
- servers. For example, to force the use of a proxy for all
- requests, except those in your local domain use something like:
-
- acl local-servers dstdomain .foo.net
- acl all src 0.0.0.0/0.0.0.0
- never_direct deny local-servers
- never_direct allow all
+ If you enable this option, every "cache miss" URL will
+ be sent out on the specified multicast address.
- or if Squid is inside a firewall and there are local intranet
- servers inside the firewall use something like:
+ Do not enable this option unless you are are absolutely
+ certain you understand what you are doing.
+DOC_END
- acl local-intranet dstdomain .foo.net
- acl local-external dstdomain external.foo.net
- always_direct deny local-external
- always_direct allow local-intranet
- never_direct allow all
+NAME: mcast_miss_ttl
+IFDEF: MULTICAST_MISS_STREAM
+TYPE: ushort
+LOC: Config.mcast_miss.ttl
+DEFAULT: 16
+DOC_START
+ This is the time-to-live value for packets multicasted
+ when multicasting off cache miss URLs is enabled. By
+ default this is set to 'site scope', i.e. 16.
+DOC_END
- This option replaces some v1.1 options such as inside_firewall
- and firewall_ip.
+NAME: mcast_miss_port
+IFDEF: MULTICAST_MISS_STREAM
+TYPE: ushort
+LOC: Config.mcast_miss.port
+DEFAULT: 3135
+DOC_START
+ This is the port number to be used in conjunction with
+ 'mcast_miss_addr'.
DOC_END
-NAME: header_access
-IFDEF: HTTP_VIOLATIONS
-TYPE: http_header_access[]
-LOC: Config.header_access
-DEFAULT: none
+NAME: mcast_miss_encode_key
+IFDEF: MULTICAST_MISS_STREAM
+TYPE: string
+LOC: Config.mcast_miss.encode_key
+DEFAULT: XXXXXXXXXXXXXXXX
DOC_START
- Usage: header_access header_name allow|deny [!]aclname ...
+ The URLs that are sent in the multicast miss stream are
+ encrypted. This is the encryption key.
+DOC_END
- WARNING: Doing this VIOLATES the HTTP standard. Enabling
- this feature could make you liable for problems which it
- causes.
-
- This option replaces the old 'anonymize_headers' and the
- older 'http_anonymizer' option with something that is much
- more configurable. This new method creates a list of ACLs
- for each header, allowing you very fine-tuned header
- mangling.
-
- You can only specify known headers for the header name.
- Other headers are reclassified as 'Other'. You can also
- refer to all the headers with 'All'.
-
- For example, to achieve the same behavior as the old
- 'http_anonymizer standard' option, you should use:
-
- header_access From deny all
- header_access Referer deny all
- header_access Server deny all
- header_access User-Agent deny all
- header_access WWW-Authenticate deny all
- header_access Link deny all
-
- Or, to reproduce the old 'http_anonymizer paranoid' feature
- you should use:
-
- header_access Allow allow all
- header_access Authorization allow all
- header_access WWW-Authenticate allow all
- header_access Proxy-Authorization allow all
- header_access Proxy-Authenticate allow all
- header_access Cache-Control allow all
- header_access Content-Encoding allow all
- header_access Content-Length allow all
- header_access Content-Type allow all
- header_access Date allow all
- header_access Expires allow all
- header_access Host allow all
- header_access If-Modified-Since allow all
- header_access Last-Modified allow all
- header_access Location allow all
- header_access Pragma allow all
- header_access Accept allow all
- header_access Accept-Charset allow all
- header_access Accept-Encoding allow all
- header_access Accept-Language allow all
- header_access Content-Language allow all
- header_access Mime-Version allow all
- header_access Retry-After allow all
- header_access Title allow all
- header_access Connection allow all
- header_access Proxy-Connection allow all
- header_access All deny all
-
- By default, all headers are allowed (no anonymizing is
- performed).
-DOC_END
-
-NAME: header_replace
-IFDEF: HTTP_VIOLATIONS
-TYPE: http_header_replace[]
-LOC: Config.header_access
-DEFAULT: none
+NAME: mcast_icp_query_timeout
+COMMENT: (msec)
+DEFAULT: 2000
+TYPE: int
+LOC: Config.Timeout.mcast_icp_query
DOC_START
- Usage: header_replace header_name message
- Example: header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-
- This option allows you to change the contents of headers
- denied with header_access above, by replacing them with
- some fixed string. This replaces the old fake_user_agent
- option.
-
- By default, headers are removed if denied.
+ For multicast peers, Squid regularly sends out ICP "probes" to
+ count how many other peers are listening on the given multicast
+ address. This value specifies how long Squid should wait to
+ count all the replies. The default is 2000 msec, or 2
+ seconds.
DOC_END
+COMMENT_START
+ INTERNAL ICON OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
NAME: icon_directory
TYPE: string
LOC: Config.icons.directory
@@ -4541,6 +4370,11 @@
including the proxy name and port.
DOC_END
+COMMENT_START
+ ERROR PAGE OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
NAME: error_directory
TYPE: string
LOC: Config.errorDirectory
@@ -4550,110 +4384,228 @@
(English) error files, either to customize them to suit your
language or company copy the template English files to another
directory and point this tag at them.
+
+ The squid developers are interested in making squid available in
+ a wide variety of languages. If you are making translations for a
+ langauge that Squid does not currently provide please consider
+ contributing your translation back to the project.
DOC_END
-NAME: maximum_single_addr_tries
-TYPE: int
-LOC: Config.retry.maxtries
-DEFAULT: 1
+NAME: error_map
+TYPE: errormap
+LOC: Config.errorMapList
+DEFAULT: none
DOC_START
- This sets the maximum number of connection attempts for a
- host that only has one address (for multiple-address hosts,
- each address is tried once).
+ Map errors to custom messages
- The default value is one attempt, the (not recommended)
- maximum is 255 tries. A warning message will be generated
- if it is set to a value greater than ten.
+ error_map message_url http_status ...
- Note: This is in addition to the request re-forwarding which
- takes place if Squid fails to get a satisfying response.
-DOC_END
+ http_status ... is a list of HTTP status codes or Squid error
+ messages.
+
+ Use in accelerators to substitute the error messages returned
+ by servers with other custom errors.
+
+ error_map http://your.server/error/404.shtml 404
+
+ Requests for error messages is a GET request for the configured
+ URL with the following special headers
+
+ X-Error-Status: The received HTTP status code (i.e. 404)
+ X-Request-URI: The requested URI where the error occurred
+
+ In Addition the following headers are forwarded from the client
+ request:
+
+ User-Agent, Cookie, X-Forwarded-For, Via, Authorization,
+ Accept, Referer
+
+ And the following headers from the server reply:
+
+ Server, Via, Location, Content-Location
+
+ The reply returned to the client will carry the original HTTP
+ headers from the real error message, but with the reply body
+ of the configured error message.
-NAME: retry_on_error
-TYPE: onoff
-LOC: Config.retry.onerror
-DEFAULT: off
-DOC_START
- If set to on Squid will automatically retry requests when
- receiving an error response. This is mainly useful if you
- are in a complex cache hierarchy to work around access
- control errors.
DOC_END
-NAME: snmp_port
-TYPE: ushort
-LOC: Config.Port.snmp
-DEFAULT: 3401
-IFDEF: SQUID_SNMP
+NAME: err_html_text
+TYPE: eol
+LOC: Config.errHtmlText
+DEFAULT: none
DOC_START
- Squid can now serve statistics and status information via SNMP.
- By default it listens to port 3401 on the machine. If you don't
- wish to use SNMP, set this to "0".
+ HTML text to include in error messages. Make this a "mailto"
+ URL to your admin address, or maybe just a link to your
+ organizations Web page.
+
+ To include this in your error messages, you must rewrite
+ the error template files (found in the "errors" directory).
+ Wherever you want the 'err_html_text' line to appear,
+ insert a %L tag in the error template file.
DOC_END
-NAME: snmp_access
-TYPE: acl_access
-LOC: Config.accessList.snmp
+NAME: deny_info
+TYPE: denyinfo
+LOC: Config.denyInfoList
DEFAULT: none
-DEFAULT_IF_NONE: deny all
-IFDEF: SQUID_SNMP
DOC_START
- Allowing or denying access to the SNMP port.
+ Usage: deny_info err_page_name acl
+ or deny_info http://... acl
+ Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
- All access to the agent is denied by default.
- usage:
+ This can be used to return a ERR_ page for requests which
+ do not pass the 'http_access' rules. Squid remembers the last
+ acl it evaluated in http_access, and if a 'deny_info' line exists
+ for that ACL Squid returns a corresponding error page.
- snmp_access allow|deny [!]aclname ...
+ The acl is typically the last acl on the http_access deny line which
+ denied access. The exceptions to this rule are:
+ - When Squid needs to request authentication credentials. It's then
+ the first authentication related acl encountered
+ - When none of the http_access lines matches. It's then the last
+ acl processed on the last http_access line.
-Example:
- snmp_access allow snmppublic localhost
- snmp_access deny all
+ You may use ERR_ pages that come with Squid or create your own pages
+ and put them into the configured errors/ directory.
+
+ Alternatively you can specify an error URL. The browsers will
+ get redirected (302) to the specified URL. %s in the redirection
+ URL will be replaced by the requested URL.
+
+ Alternatively you can tell Squid to reset the TCP connection
+ by specifying TCP_RESET.
DOC_END
-NAME: snmp_incoming_address
-TYPE: address
-LOC: Config.Addrs.snmp_incoming
-DEFAULT: 0.0.0.0
-IFDEF: SQUID_SNMP
-DOC_NONE
-NAME: snmp_outgoing_address
-TYPE: address
-LOC: Config.Addrs.snmp_outgoing
-DEFAULT: 255.255.255.255
-IFDEF: SQUID_SNMP
-DOC_START
- Just like 'udp_incoming_address' above, but for the SNMP port.
+COMMENT_START
+ OPTIONS INFLUENCING REQUEST FORWARDING
+ -----------------------------------------------------------------------------
+COMMENT_END
- snmp_incoming_address is used for the SNMP socket receiving
- messages from SNMP agents.
- snmp_outgoing_address is used for SNMP packets returned to SNMP
- agents.
+NAME: nonhierarchical_direct
+TYPE: onoff
+LOC: Config.onoff.nonhierarchical_direct
+DEFAULT: on
+DOC_START
+ By default, Squid will send any non-hierarchical requests
+ (matching hierarchy_stoplist or not cacheable request type) direct
+ to origin servers.
- The default snmp_incoming_address (0.0.0.0) is to listen on all
- available network interfaces.
+ If you set this to off, Squid will prefer to send these
+ requests to parents.
- If snmp_outgoing_address is set to 255.255.255.255 (the default)
- it will use the same socket as snmp_incoming_address. Only
- change this if you want to have SNMP replies sent using another
- address than where this Squid listens for SNMP queries.
+ Note that in most configurations, by turning this off you will only
+ add latency to these request without any improvement in global hit
+ ratio.
- NOTE, snmp_incoming_address and snmp_outgoing_address can not have
- the same value since they both use port 3401.
+ If you are inside an firewall see never_direct instead of
+ this directive.
DOC_END
-NAME: as_whois_server
-TYPE: string
-LOC: Config.as_whois_server
-DEFAULT: whois.ra.net
-DEFAULT_IF_NONE: whois.ra.net
+NAME: prefer_direct
+TYPE: onoff
+LOC: Config.onoff.prefer_direct
+DEFAULT: off
DOC_START
- WHOIS server to query for AS numbers. NOTE: AS numbers are
- queried only when Squid starts up, not for every request.
-DOC_END
+ Normally Squid tries to use parents for most requests. If you for some
+ reason like it to first try going direct and only use a parent if
+ going direct fails set this to on.
-NAME: incoming_icp_average
-TYPE: int
-DEFAULT: 6
+ By combining nonhierarchical_direct off and prefer_direct on you
+ can set up Squid to use a parent as a backup path if going direct
+ fails.
+
+ Note: If you want Squid to use parents for all requests see
+ the never_direct directive. prefer_direct only modifies how Squid
+ acts on cacheable requests.
+DOC_END
+
+NAME: always_direct
+TYPE: acl_access
+LOC: Config.accessList.AlwaysDirect
+DEFAULT: none
+DOC_START
+ Usage: always_direct allow|deny [!]aclname ...
+
+ Here you can use ACL elements to specify requests which should
+ ALWAYS be forwarded by Squid to the origin servers without using
+ any peers. For example, to always directly forward requests for
+ local servers ignoring any parents or siblings you may have use
+ something like:
+
+ acl local-servers dstdomain my.domain.net
+ always_direct allow local-servers
+
+ To always forward FTP requests directly, use
+
+ acl FTP proto FTP
+ always_direct allow FTP
+
+ NOTE: There is a similar, but opposite option named
+ 'never_direct'. You need to be aware that "always_direct deny
+ foo" is NOT the same thing as "never_direct allow foo". You
+ may need to use a deny rule to exclude a more-specific case of
+ some other rule. Example:
+
+ acl local-external dstdomain external.foo.net
+ acl local-servers dstdomain .foo.net
+ always_direct deny local-external
+ always_direct allow local-servers
+
+ NOTE: If your goal is to make the client forward the request
+ directly to the origin server bypassing Squid then this needs
+ to be done in the client configuration. Squid configuration
+ can only tell Squid how Squid should fetch the object.
+
+ NOTE: This directive is not related to caching. The replies
+ is cached as usual even if you use always_direct. To not cache
+ the replies see no_cache.
+
+ This option replaces some v1.1 options such as local_domain
+ and local_ip.
+DOC_END
+
+NAME: never_direct
+TYPE: acl_access
+LOC: Config.accessList.NeverDirect
+DEFAULT: none
+DOC_START
+ Usage: never_direct allow|deny [!]aclname ...
+
+ never_direct is the opposite of always_direct. Please read
+ the description for always_direct if you have not already.
+
+ With 'never_direct' you can use ACL elements to specify
+ requests which should NEVER be forwarded directly to origin
+ servers. For example, to force the use of a proxy for all
+ requests, except those in your local domain use something like:
+
+ acl local-servers dstdomain .foo.net
+ acl all src 0.0.0.0/0.0.0.0
+ never_direct deny local-servers
+ never_direct allow all
+
+ or if Squid is inside a firewall and there are local intranet
+ servers inside the firewall use something like:
+
+ acl local-intranet dstdomain .foo.net
+ acl local-external dstdomain external.foo.net
+ always_direct deny local-external
+ always_direct allow local-intranet
+ never_direct allow all
+
+ This option replaces some v1.1 options such as inside_firewall
+ and firewall_ip.
+DOC_END
+
+COMMENT_START
+ ADVANCED NETWORKING OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: incoming_icp_average
+TYPE: int
+DEFAULT: 6
LOC: Config.comm_incoming.icp_average
DOC_NONE
@@ -4691,16 +4643,404 @@
you understand the algorithms in comm_select.c first!
DOC_END
-NAME: max_open_disk_fds
-TYPE: int
-LOC: Config.max_open_disk_fds
-DEFAULT: 0
+NAME: tcp_recv_bufsize
+COMMENT: (bytes)
+TYPE: b_size_t
+DEFAULT: 0 bytes
+LOC: Config.tcpRcvBufsz
+DOC_START
+ Size of receive buffer to set for TCP sockets. Probably just
+ as easy to change your kernel's default. Set to zero to use
+ the default buffer size.
+DOC_END
+
+COMMENT_START
+ DNS OPTIONS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: check_hostnames
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.check_hostnames
+DOC_START
+ For security and stability reasons Squid by default checks
+ hostnames for Internet standard RFC compliance. If you do not want
+ Squid to perform these checks then turn this directive off.
+DOC_END
+
+NAME: allow_underscore
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.allow_underscore
+DOC_START
+ Underscore characters is not strictly allowed in Internet hostnames
+ but nevertheless used by many sites. Set this to off if you want
+ Squid to be strict about the standard.
+ This check is performed only when check_hostnames is set to on.
+DOC_END
+
+NAME: cache_dns_program
+TYPE: string
+IFDEF: USE_DNSSERVERS
+DEFAULT: @DEFAULT_DNSSERVER@
+LOC: Config.Program.dnsserver
+DOC_START
+ Specify the location of the executable for dnslookup process.
+DOC_END
+
+NAME: dns_children
+TYPE: int
+IFDEF: USE_DNSSERVERS
+DEFAULT: 5
+LOC: Config.dnsChildren
+DOC_START
+ The number of processes spawn to service DNS name lookups.
+ For heavily loaded caches on large servers, you should
+ probably increase this value to at least 10. The maximum
+ is 32. The default is 5.
+
+ You must have at least one dnsserver process.
+DOC_END
+
+NAME: dns_retransmit_interval
+TYPE: time_t
+DEFAULT: 5 seconds
+LOC: Config.Timeout.idns_retransmit
+IFDEF: !USE_DNSSERVERS
+DOC_START
+ Initial retransmit interval for DNS queries. The interval is
+ doubled each time all configured DNS servers have been tried.
+
+DOC_END
+
+NAME: dns_timeout
+TYPE: time_t
+DEFAULT: 2 minutes
+LOC: Config.Timeout.idns_query
+IFDEF: !USE_DNSSERVERS
+DOC_START
+ DNS Query timeout. If no response is received to a DNS query
+ within this time all DNS servers for the queried domain
+ are assumed to be unavailable.
+DOC_END
+
+NAME: dns_defnames
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.res_defnames
+DOC_START
+ Normally the RES_DEFNAMES resolver option is disabled
+ (see res_init(3)). This prevents caches in a hierarchy
+ from interpreting single-component hostnames locally. To allow
+ Squid to handle single-component names, enable this option.
+DOC_END
+
+NAME: dns_nameservers
+TYPE: wordlist
+DEFAULT: none
+LOC: Config.dns_nameservers
+DOC_START
+ Use this if you want to specify a list of DNS name servers
+ (IP addresses) to use instead of those given in your
+ /etc/resolv.conf file.
+ On Windows platforms, if no value is specified here or in
+ the /etc/resolv.conf file, the list of DNS name servers are
+ taken from the Windows registry, both static and dynamic DHCP
+ configurations are supported.
+
+ Example: dns_nameservers 10.0.0.1 192.172.0.4
+DOC_END
+
+NAME: hosts_file
+TYPE: string
+DEFAULT: @DEFAULT_HOSTS@
+LOC: Config.etcHostsPath
+DOC_START
+ Location of the host-local IP name-address associations
+ database. Most Operating Systems have such a file on different
+ default locations:
+ - Un*X & Linux: /etc/hosts
+ - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
+ (%SystemRoot% value install default is c:\winnt)
+ - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
+ (%SystemRoot% value install default is c:\windows)
+ - Windows 9x/Me: %windir%\hosts
+ (%windir% value is usually c:\windows)
+ - Cygwin: /etc/hosts
+
+ The file contains newline-separated definitions, in the
+ form ip_address_in_dotted_form name [name ...] names are
+ whitespace-separated. Lines beginning with an hash (#)
+ character are comments.
+
+ The file is checked at startup and upon configuration.
+ If set to 'none', it won't be checked.
+ If append_domain is used, that domain will be added to
+ domain-local (i.e. not containing any dot character) host
+ definitions.
+DOC_END
+
+NAME: dns_testnames
+TYPE: wordlist
+LOC: Config.dns_testname_list
+DEFAULT: none
+DEFAULT_IF_NONE: netscape.com internic.net nlanr.net microsoft.com
+DOC_START
+ The DNS tests exit as soon as the first site is successfully looked up
+
+ This test can be disabled with the -D command line option.
+DOC_END
+
+NAME: append_domain
+TYPE: string
+LOC: Config.appendDomain
+DEFAULT: none
+DOC_START
+ Appends local domain name to hostnames without any dots in
+ them. append_domain must begin with a period.
+
+ Be warned there are now Internet names with no dots in
+ them using only top-domain names, so setting this may
+ cause some Internet sites to become unavailable.
+
+Example:
+ append_domain .yourdomain.com
+DOC_END
+
+NAME: ignore_unknown_nameservers
+TYPE: onoff
+LOC: Config.onoff.ignore_unknown_nameservers
+DEFAULT: on
+DOC_START
+ By default Squid checks that DNS responses are received
+ from the same IP addresses they are sent to. If they
+ don't match, Squid ignores the response and writes a warning
+ message to cache.log. You can allow responses from unknown
+ nameservers by setting this option to 'off'.
+DOC_END
+
+NAME: ipcache_size
+COMMENT: (number of entries)
+TYPE: int
+DEFAULT: 1024
+LOC: Config.ipcache.size
+DOC_NONE
+
+NAME: ipcache_low
+COMMENT: (percent)
+TYPE: int
+DEFAULT: 90
+LOC: Config.ipcache.low
+DOC_NONE
+
+NAME: ipcache_high
+COMMENT: (percent)
+TYPE: int
+DEFAULT: 95
+LOC: Config.ipcache.high
+DOC_START
+ The size, low-, and high-water marks for the IP cache.
+DOC_END
+
+NAME: fqdncache_size
+COMMENT: (number of entries)
+TYPE: int
+DEFAULT: 1024
+LOC: Config.fqdncache.size
+DOC_START
+ Maximum number of FQDN cache entries.
+DOC_END
+
+COMMENT_START
+ MISCELLANEOUS
+ -----------------------------------------------------------------------------
+COMMENT_END
+
+NAME: memory_pools
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.mem_pools
+DOC_START
+ If set, Squid will keep pools of allocated (but unused) memory
+ available for future use. If memory is a premium on your
+ system and you believe your malloc library outperforms Squid
+ routines, disable this.
+DOC_END
+
+NAME: memory_pools_limit
+COMMENT: (bytes)
+TYPE: b_size_t
+DEFAULT: 5 MB
+LOC: Config.MemPools.limit
+DOC_START
+ Used only with memory_pools on:
+ memory_pools_limit 50 MB
+
+ If set to a non-zero value, Squid will keep at most the specified
+ limit of allocated (but unused) memory in memory pools. All free()
+ requests that exceed this limit will be handled by your malloc
+ library. Squid does not pre-allocate any memory, just safe-keeps
+ objects that otherwise would be free()d. Thus, it is safe to set
+ memory_pools_limit to a reasonably high value even if your
+ configuration will use less memory.
+
+ If set to zero, Squid will keep all memory it can. That is, there
+ will be no limit on the total amount of memory used for safe-keeping.
+
+ To disable memory allocation optimization, do not set
+ memory_pools_limit to 0. Set memory_pools to "off" instead.
+
+ An overhead for maintaining memory pools is not taken into account
+ when the limit is checked. This overhead is close to four bytes per
+ object kept. However, pools may actually _save_ memory because of
+ reduced memory thrashing in your malloc library.
+DOC_END
+
+NAME: forwarded_for
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: on
+LOC: opt_forwarded_for
+DOC_START
+ If set, Squid will include your system's IP address or name
+ in the HTTP requests it forwards. By default it looks like
+ this:
+
+ X-Forwarded-For: 192.1.2.3
+
+ If you disable this, it will appear as
+
+ X-Forwarded-For: unknown
+DOC_END
+
+NAME: cachemgr_passwd
+TYPE: cachemgrpasswd
+DEFAULT: none
+LOC: Config.passwd_list
+DOC_START
+ Specify passwords for cachemgr operations.
+
+ Usage: cachemgr_passwd password action action ...
+
+ Some valid actions are (see cache manager menu for a full list):
+ 5min
+ 60min
+ asndb
+ authenticator
+ cbdata
+ client_list
+ comm_incoming
+ config *
+ counters
+ delay
+ digest_stats
+ dns
+ events
+ filedescriptors
+ fqdncache
+ histograms
+ http_headers
+ info
+ io
+ ipcache
+ mem
+ menu
+ netdb
+ non_peers
+ objects
+ offline_toggle *
+ pconn
+ peer_select
+ redirector
+ refresh
+ server_list
+ shutdown *
+ store_digest
+ storedir
+ utilization
+ via_headers
+ vm_objects
+
+ * Indicates actions which will not be performed without a
+ valid password, others can be performed if not listed here.
+
+ To disable an action, set the password to "disable".
+ To allow performing an action without a password, set the
+ password to "none".
+
+ Use the keyword "all" to set the same password for all actions.
+
+Example:
+ cachemgr_passwd secret shutdown
+ cachemgr_passwd lesssssssecret info stats/objects
+ cachemgr_passwd disable all
+DOC_END
+
+NAME: client_db
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: on
+LOC: Config.onoff.client_db
+DOC_START
+ If you want to disable collecting per-client statistics,
+ turn off client_db here.
+DOC_END
+
+NAME: reload_into_ims
+IFDEF: HTTP_VIOLATIONS
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.reload_into_ims
+DOC_START
+ When you enable this option, client no-cache or ``reload''
+ requests will be changed to If-Modified-Since requests.
+ Doing this VIOLATES the HTTP standard. Enabling this
+ feature could make you liable for problems which it
+ causes.
+
+ see also refresh_pattern for a more selective approach.
+DOC_END
+
+NAME: maximum_single_addr_tries
+TYPE: int
+LOC: Config.retry.maxtries
+DEFAULT: 1
+DOC_START
+ This sets the maximum number of connection attempts for a
+ host that only has one address (for multiple-address hosts,
+ each address is tried once).
+
+ The default value is one attempt, the (not recommended)
+ maximum is 255 tries. A warning message will be generated
+ if it is set to a value greater than ten.
+
+ Note: This is in addition to the request re-forwarding which
+ takes place if Squid fails to get a satisfying response.
+DOC_END
+
+NAME: retry_on_error
+TYPE: onoff
+LOC: Config.retry.onerror
+DEFAULT: off
+DOC_START
+ If set to on Squid will automatically retry requests when
+ receiving an error response. This is mainly useful if you
+ are in a complex cache hierarchy to work around access
+ control errors.
+DOC_END
+
+NAME: as_whois_server
+TYPE: string
+LOC: Config.as_whois_server
+DEFAULT: whois.ra.net
+DEFAULT_IF_NONE: whois.ra.net
DOC_START
- To avoid having disk as the I/O bottleneck Squid can optionally
- bypass the on-disk cache if more than this amount of disk file
- descriptors are open.
-
- A value of 0 indicates no limit.
+ WHOIS server to query for AS numbers. NOTE: AS numbers are
+ queried only when Squid starts up, not for every request.
DOC_END
NAME: offline_mode
@@ -4737,120 +5077,6 @@
violation.
DOC_END
-NAME: broken_posts
-TYPE: acl_access
-DEFAULT: none
-LOC: Config.accessList.brokenPosts
-DOC_START
- A list of ACL elements which, if matched, causes Squid to send
- an extra CRLF pair after the body of a PUT/POST request.
-
- Some HTTP servers has broken implementations of PUT/POST,
- and rely on an extra CRLF pair sent by some WWW clients.
-
- Quote from RFC2068 section 4.1 on this matter:
-
- Note: certain buggy HTTP/1.0 client implementations generate an
- extra CRLF's after a POST request. To restate what is explicitly
- forbidden by the BNF, an HTTP/1.1 client must not preface or follow
- a request with an extra CRLF.
-
-Example:
- acl buggy_server url_regex ^http://....
- broken_posts allow buggy_server
-DOC_END
-
-NAME: mcast_miss_addr
-IFDEF: MULTICAST_MISS_STREAM
-TYPE: address
-LOC: Config.mcast_miss.addr
-DEFAULT: 255.255.255.255
-DOC_START
- If you enable this option, every "cache miss" URL will
- be sent out on the specified multicast address.
-
- Do not enable this option unless you are are absolutely
- certain you understand what you are doing.
-DOC_END
-
-NAME: mcast_miss_ttl
-IFDEF: MULTICAST_MISS_STREAM
-TYPE: ushort
-LOC: Config.mcast_miss.ttl
-DEFAULT: 16
-DOC_START
- This is the time-to-live value for packets multicasted
- when multicasting off cache miss URLs is enabled. By
- default this is set to 'site scope', i.e. 16.
-DOC_END
-
-NAME: mcast_miss_port
-IFDEF: MULTICAST_MISS_STREAM
-TYPE: ushort
-LOC: Config.mcast_miss.port
-DEFAULT: 3135
-DOC_START
- This is the port number to be used in conjunction with
- 'mcast_miss_addr'.
-DOC_END
-
-NAME: mcast_miss_encode_key
-IFDEF: MULTICAST_MISS_STREAM
-TYPE: string
-LOC: Config.mcast_miss.encode_key
-DEFAULT: XXXXXXXXXXXXXXXX
-DOC_START
- The URLs that are sent in the multicast miss stream are
- encrypted. This is the encryption key.
-DOC_END
-
-NAME: nonhierarchical_direct
-TYPE: onoff
-LOC: Config.onoff.nonhierarchical_direct
-DEFAULT: on
-DOC_START
- By default, Squid will send any non-hierarchical requests
- (matching hierarchy_stoplist or not cacheable request type) direct
- to origin servers.
-
- If you set this to off, Squid will prefer to send these
- requests to parents.
-
- Note that in most configurations, by turning this off you will only
- add latency to these request without any improvement in global hit
- ratio.
-
- If you are inside an firewall see never_direct instead of
- this directive.
-DOC_END
-
-NAME: prefer_direct
-TYPE: onoff
-LOC: Config.onoff.prefer_direct
-DEFAULT: off
-DOC_START
- Normally Squid tries to use parents for most requests. If you for some
- reason like it to first try going direct and only use a parent if
- going direct fails set this to on.
-
- By combining nonhierarchical_direct off and prefer_direct on you
- can set up Squid to use a parent as a backup path if going direct
- fails.
-
- Note: If you want Squid to use parents for all requests see
- the never_direct directive. prefer_direct only modifies how Squid
- acts on cacheable requests.
-DOC_END
-
-NAME: strip_query_terms
-TYPE: onoff
-LOC: Config.onoff.strip_query_terms
-DEFAULT: on
-DOC_START
- By default, Squid strips query terms from requested URLs before
- logging. This protects your user's privacy.
-DOC_END
-
NAME: coredump_dir
TYPE: string
LOC: Config.coredump_dir
@@ -4884,18 +5110,6 @@
be allowed to request.
DOC_END
-NAME: ignore_unknown_nameservers
-TYPE: onoff
-LOC: Config.onoff.ignore_unknown_nameservers
-DEFAULT: on
-DOC_START
- By default Squid checks that DNS responses are received
- from the same IP addresses they are sent to. If they
- don't match, Squid ignores the response and writes a warning
- message to cache.log. You can allow responses from unknown
- nameservers by setting this option to 'off'.
-DOC_END
-
NAME: chroot
TYPE: string
LOC: Config.chroot_dir
@@ -4903,9 +5117,9 @@
DOC_START
Use this to have Squid do a chroot() while initializing. This
also causes Squid to fully drop root privileges after
- initializing. This means, for example, that if you use a HTTP
- port less than 1024 and try to reconfigure, you will get an
- error.
+ initializing. This means, for example, if you use a HTTP
+ port less than 1024 and try to reconfigure, you will may get an
+ error saying that Squid can not open the port.
DOC_END
NAME: balance_on_multiple_ip
@@ -4934,31 +5148,6 @@
reasons.
DOC_END
-NAME: extension_methods
-TYPE: extension_method
-LOC: RequestMethodStr
-DEFAULT: none
-DOC_START
- Squid only knows about standardized HTTP request methods.
- You can add up to 20 additional "extension" methods here.
-DOC_END
-
-NAME: request_entities
-TYPE: onoff
-LOC: Config.onoff.request_entities
-DEFAULT: off
-DOC_START
- Squid defaults to deny GET and HEAD requests with request entities,
- as the meaning of such requests are undefined in the HTTP standard
- even if not explicitly forbidden.
-
- Set this directive to on if you have clients which insists
- on sending request entities in GET or HEAD requests. But be warned
- that there is server software (both proxies and web servers) which
- can fail to properly process this kind of request which may make you
- vulnerable to cache pollution attacks if enabled.
-DOC_END
-
NAME: high_response_time_warning
TYPE: int
COMMENT: (msec)
@@ -4991,64 +5180,6 @@
the administrators attention.
DOC_END
-NAME: store_dir_select_algorithm
-TYPE: string
-LOC: Config.store_dir_select_algorithm
-DEFAULT: least-load
-DOC_START
- Set this to 'round-robin' as an alternative.
-DOC_END
-
-NAME: forward_log
-IFDEF: WIP_FWD_LOG
-TYPE: string
-DEFAULT: none
-LOC: Config.Log.forward
-DOC_START
- Logs the server-side requests.
-
- This is currently work in progress.
-DOC_END
-
-NAME: ie_refresh
-COMMENT: on|off
-TYPE: onoff
-LOC: Config.onoff.ie_refresh
-DEFAULT: off
-DOC_START
- Microsoft Internet Explorer up until version 5.5 Service
- Pack 1 has an issue with transparent proxies, wherein it
- is impossible to force a refresh. Turning this on provides
- a partial fix to the problem, by causing all IMS-REFRESH
- requests from older IE versions to check the origin server
- for fresh content. This reduces hit ratio by some amount
- (~10% in my experience), but allows users to actually get
- fresh content when they want it. Note that because Squid
- cannot tell if the user is using 5.5 or 5.5SP1, the behavior
- of 5.5 is unchanged from old versions of Squid (i.e. a
- forced refresh is impossible). Newer versions of IE will,
- hopefully, continue to have the new behavior and will be
- handled based on that assumption. This option defaults to
- the old Squid behavior, which is better for hit ratios but
- worse for clients using IE, if they need to be able to
- force fresh content.
-DOC_END
-
-NAME: vary_ignore_expire
-COMMENT: on|off
-TYPE: onoff
-LOC: Config.onoff.vary_ignore_expire
-DEFAULT: off
-DOC_START
- Many HTTP servers supporting Vary gives such objects
- immediate expiry time with no cache-control header
- when requested by a HTTP/1.0 client. This option
- enables Squid to ignore such expiry times until
- HTTP/1.1 is fully implemented.
- WARNING: This may eventually cause some varying
- objects not intended for caching to get cached.
-DOC_END
-
NAME: sleep_after_fork
COMMENT: (microseconds)
TYPE: int
@@ -5059,45 +5190,12 @@
sleeps the specified number of microseconds after a fork()
system call. This sleep may help the situation where your
system reports fork() failures due to lack of (virtual)
- memory. Note, however, that if you have a lot of child
+ memory. Note, however, if you have a lot of child
processes, these sleep delays will add up and your
Squid will not service requests for some amount of time
until all the child processes have been started.
On Windows value less then 1000 (1 milliseconds) are
rounded to 1000.
-DOC_END
-
-NAME: minimum_expiry_time
-COMMENT: (seconds)
-TYPE: time_t
-LOC: Config.minimum_expiry_time
-DEFAULT: 60 seconds
-DOC_START
- The minimum caching time according to (Expires - Date)
- Headers Squid honors if the object can't be revalidated
- defaults to 60 seconds. In reverse proxy enorinments it
- might be desirable to honor shorter object lifetimes. It
- is most likely better to make your server return a
- meaningful Last-Modified header however.
-DOC_END
-
-NAME: relaxed_header_parser
-COMMENT: on|off|warn
-TYPE: tristate
-LOC: Config.onoff.relaxed_header_parser
-DEFAULT: on
-DOC_START
- In the default "on" setting Squid accepts certain forms
- of non-compliant HTTP messages where it is unambiguous
- what the sending application intended even if the message
- is not correctly formatted. The messages is then normalized
- to the correct form when forwarded by Squid.
-
- If set to "warn" then a warning will be emitted in cache.log
- each time such HTTP error is encountered.
-
- If set to "off" then such HTTP errors will cause the request
- or response to be rejected.
DOC_END
EOF
diff -ruN squid-2.6.STABLE14/src/client_side.c squid-2.6.STABLE15/src/client_side.c
--- squid-2.6.STABLE14/src/client_side.c Sun Jul 15 03:52:17 2007
+++ squid-2.6.STABLE15/src/client_side.c Fri Aug 31 07:48:23 2007
@@ -1,6 +1,6 @@
/*
- * $Id: client_side.c,v 1.693.2.13 2007/07/15 09:52:17 hno Exp $
+ * $Id: client_side.c,v 1.693.2.18 2007/08/31 13:48:23 hno Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
@@ -424,7 +424,7 @@
http->redirect_state = REDIRECT_PENDING;
clientRedirectStart(http);
} else {
- int require_auth = (answer == ACCESS_REQ_PROXY_AUTH || aclIsProxyAuth(AclMatchedName));
+ int require_auth = (answer == ACCESS_REQ_PROXY_AUTH || aclIsProxyAuth(AclMatchedName)) && !http->request->flags.transparent;
debug(33, 5) ("Access Denied: %s\n", http->uri);
debug(33, 5) ("AclMatchedName = %s\n",
AclMatchedName ? AclMatchedName : "");
@@ -1839,6 +1839,7 @@
assert(actual_clen >= 0);
httpHeaderDelById(hdr, HDR_CONTENT_LENGTH);
httpHeaderPutSize(hdr, HDR_CONTENT_LENGTH, actual_clen);
+ rep->content_length = actual_clen;
debug(33, 3) ("clientBuildRangeHeader: actual content length: %" PRINTF_OFF_T "\n", actual_clen);
}
}
@@ -1990,7 +1991,7 @@
request->flags.proxy_keepalive = 0;
}
/* Append Via */
- {
+ if (Config.onoff.via) {
char bbuf[MAX_URL + 32];
String strVia = httpHeaderGetList(hdr, HDR_VIA);
snprintf(bbuf, MAX_URL + 32, "%d.%d %s",
@@ -2129,6 +2130,11 @@
}
return;
}
+ if (strcmp(mem->url, urlCanonical(r)) != 0) {
+ debug(33, 1) ("clientCacheHit: URL mismatch '%s' != '%s'?\n", e->mem_obj->url, urlCanonical(r));
+ clientProcessMiss(http);
+ return;
+ }
/*
* Got the headers, now grok them
*/
@@ -2845,6 +2851,7 @@
if (content_length >= 0) {
httpHeaderPutSize(&state->http->reply->header, HDR_CONTENT_LENGTH, content_length);
}
+ http->reply->content_length = content_length;
}
clientCheckHeaderDone(state);
}
@@ -3109,10 +3116,7 @@
} else if ((done = clientCheckTransferDone(http)) != 0 || size == 0) {
debug(33, 5) ("clientWriteComplete: FD %d transfer is DONE\n", fd);
/* We're finished case */
- if (httpReplyBodySize(http->request->method, entry->mem_obj->reply) < 0) {
- debug(33, 5) ("clientWriteComplete: closing, content_length < 0\n");
- comm_close(fd);
- } else if (!done) {
+ if (!done) {
debug(33, 5) ("clientWriteComplete: closing, !done\n");
comm_close(fd);
} else if (clientGotNotEnough(http)) {
@@ -3972,7 +3976,7 @@
if (conn->port->urlgroup)
request->urlgroup = xstrdup(conn->port->urlgroup);
#if LINUX_TPROXY
- request->flags.tproxy = conn->port->tproxy;
+ request->flags.tproxy = conn->port->tproxy && need_linux_tproxy;
#endif
request->flags.accelerated = http->flags.accel;
request->flags.transparent = http->flags.transparent;
diff -ruN squid-2.6.STABLE14/src/comm_generic.c squid-2.6.STABLE15/src/comm_generic.c
--- squid-2.6.STABLE14/src/comm_generic.c Tue Oct 31 11:25:15 2006
+++ squid-2.6.STABLE15/src/comm_generic.c Fri Aug 31 07:41:41 2007
@@ -1,6 +1,6 @@
/*
- * $Id: comm_generic.c,v 1.8 2006/10/31 18:25:15 serassio Exp $
+ * $Id: comm_generic.c,v 1.8.2.1 2007/08/31 13:41:41 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -356,7 +356,7 @@
int
comm_select(int msec)
{
- static time_t last_timeout = 0;
+ static double last_timeout = 0.0;
int rc;
double start = current_dtime;
@@ -377,9 +377,13 @@
storeDirCallback();
/* Check timeouts once per second */
- if (last_timeout != squid_curtime) {
- last_timeout = squid_curtime;
+ if (last_timeout + 0.999 < current_dtime) {
+ last_timeout = current_dtime;
checkTimeouts();
+ } else {
+ int max_timeout = (last_timeout + 1.0 - current_dtime) * 1000;
+ if (max_timeout < msec)
+ msec = max_timeout;
}
comm_select_handled = 0;
diff -ruN squid-2.6.STABLE14/src/comm_select.c squid-2.6.STABLE15/src/comm_select.c
--- squid-2.6.STABLE14/src/comm_select.c Fri Jun 22 06:07:35 2007
+++ squid-2.6.STABLE15/src/comm_select.c Tue Jul 17 14:36:22 2007
@@ -1,6 +1,6 @@
/*
- * $Id: comm_select.c,v 1.80.2.1 2007/06/22 12:07:35 adrian Exp $
+ * $Id: comm_select.c,v 1.80.2.2 2007/07/17 20:36:22 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -94,7 +94,7 @@
}
void
-commClose(int fd)
+commOpen(int fd)
{
}
diff -ruN squid-2.6.STABLE14/src/delay_pools.c squid-2.6.STABLE15/src/delay_pools.c
--- squid-2.6.STABLE14/src/delay_pools.c Mon Oct 23 05:22:21 2006
+++ squid-2.6.STABLE15/src/delay_pools.c Fri Aug 31 08:08:52 2007
@@ -1,6 +1,6 @@
/*
- * $Id: delay_pools.c,v 1.34 2006/10/23 11:22:21 hno Exp $
+ * $Id: delay_pools.c,v 1.34.2.1 2007/08/31 14:08:52 hno Exp $
*
* DEBUG: section 77 Delay Pools
* AUTHOR: David Luyer
@@ -613,7 +613,7 @@
}
/*
- * this records actual bytes recieved. always recorded, even if the
+ * this records actual bytes received. always recorded, even if the
* class is disabled - it's more efficient to just do it than to do all
* the checks.
*/
diff -ruN squid-2.6.STABLE14/src/fs/Makefile.in squid-2.6.STABLE15/src/fs/Makefile.in
--- squid-2.6.STABLE14/src/fs/Makefile.in Fri Jun 22 18:14:58 2007
+++ squid-2.6.STABLE15/src/fs/Makefile.in Sun Aug 12 06:41:09 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.41.2.1 2007/06/23 00:14:58 hno Exp $
+# $Id: Makefile.in,v 1.41.2.2 2007/08/12 12:41:09 hno Exp $
#
@@ -160,6 +160,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -252,8 +253,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -268,24 +267,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/src/ftp.c squid-2.6.STABLE15/src/ftp.c
--- squid-2.6.STABLE14/src/ftp.c Sat Jun 2 18:40:32 2007
+++ squid-2.6.STABLE15/src/ftp.c Fri Aug 31 07:40:49 2007
@@ -1,6 +1,6 @@
/*
- * $Id: ftp.c,v 1.342.2.3 2007/06/03 00:40:32 hno Exp $
+ * $Id: ftp.c,v 1.342.2.4 2007/08/31 13:40:49 hno Exp $
*
* DEBUG: section 9 File Transfer Protocol (FTP)
* AUTHOR: Harvest Derived
@@ -1683,6 +1683,7 @@
ftpUnhack(ftpState);
} else if (code < 0) {
ftpFail(ftpState);
+ return;
}
ftpSendSize(ftpState);
}
@@ -1719,6 +1720,7 @@
}
} else if (code < 0) {
ftpFail(ftpState);
+ return;
}
ftpSendPasv(ftpState);
}
diff -ruN squid-2.6.STABLE14/src/http.c squid-2.6.STABLE15/src/http.c
--- squid-2.6.STABLE14/src/http.c Mon Mar 26 17:08:00 2007
+++ squid-2.6.STABLE15/src/http.c Sat Jul 21 15:05:55 2007
@@ -1,6 +1,6 @@
/*
- * $Id: http.c,v 1.419.2.7 2007/03/26 23:08:00 hno Exp $
+ * $Id: http.c,v 1.419.2.8 2007/07/21 21:05:55 hno Exp $
*
* DEBUG: section 11 Hypertext Transfer Protocol (HTTP)
* AUTHOR: Harvest Derived
@@ -891,21 +891,23 @@
fwdFail(httpState->fwd, err);
comm_close(fd);
}
- } else if (len == 0 && entry->mem_obj->inmem_hi == 0) {
+ } else if (len == 0 && entry->mem_obj->inmem_hi == 0 && !httpState->reply_hdr.size) {
fwdFail(httpState->fwd, errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_BAD_GATEWAY, httpState->fwd->request));
httpState->eof = 1;
comm_close(fd);
} else if (len == 0) {
/* Connection closed; retrieval done. */
httpState->eof = 1;
- if (httpState->reply_hdr_state < 2)
+ if (httpState->reply_hdr_state < 2) {
/*
* Yes Henrik, there is a point to doing this. When we
* called httpProcessReplyHeader() before, we didn't find
* the end of headers, but now we are definately at EOF, so
* we want to process the reply headers.
*/
- httpProcessReplyHeader(httpState, buf, len);
+ /* Fake an "end-of-headers" to work around such broken servers */
+ httpProcessReplyHeader(httpState, "\r\n", 2);
+ }
if (entry->mem_obj->reply->sline.status == HTTP_HEADER_TOO_LARGE) {
storeEntryReset(entry);
fwdFail(httpState->fwd, errorCon(ERR_TOO_BIG, HTTP_BAD_GATEWAY, httpState->fwd->request));
diff -ruN squid-2.6.STABLE14/src/ipcache.c squid-2.6.STABLE15/src/ipcache.c
--- squid-2.6.STABLE14/src/ipcache.c Tue Aug 15 18:27:20 2006
+++ squid-2.6.STABLE15/src/ipcache.c Fri Aug 31 07:46:25 2007
@@ -1,6 +1,6 @@
/*
- * $Id: ipcache.c,v 1.245 2006/08/16 00:27:20 hno Exp $
+ * $Id: ipcache.c,v 1.245.2.1 2007/08/31 13:46:25 hno Exp $
*
* DEBUG: section 14 IP Cache
* AUTHOR: Harvest Derived
@@ -60,6 +60,8 @@
int hits;
int misses;
int negative_hits;
+ int numeric_hits;
+ int invalid;
} IpcacheStats;
static dlink_list lru_list;
@@ -411,12 +413,14 @@
IpcacheStats.requests++;
if (name == NULL || name[0] == '\0') {
debug(14, 4) ("ipcache_nbgethostbyname: Invalid name!\n");
+ IpcacheStats.invalid++;
dns_error_message = "Invalid hostname";
handler(NULL, handlerData);
return;
}
if ((addrs = ipcacheCheckNumeric(name))) {
dns_error_message = NULL;
+ IpcacheStats.numeric_hits++;
handler(addrs, handlerData);
return;
}
@@ -514,6 +518,7 @@
}
dns_error_message = NULL;
if ((addrs = ipcacheCheckNumeric(name))) {
+ IpcacheStats.numeric_hits++;
return addrs;
}
IpcacheStats.misses++;
@@ -548,16 +553,20 @@
dlink_node *m;
assert(ip_table != NULL);
storeAppendPrintf(sentry, "IP Cache Statistics:\n");
- storeAppendPrintf(sentry, "IPcache Entries: %d\n",
+ storeAppendPrintf(sentry, "IPcache Entries: %d\n",
memInUse(MEM_IPCACHE_ENTRY));
storeAppendPrintf(sentry, "IPcache Requests: %d\n",
IpcacheStats.requests);
- storeAppendPrintf(sentry, "IPcache Hits: %d\n",
+ storeAppendPrintf(sentry, "IPcache Hits: %d\n",
IpcacheStats.hits);
- storeAppendPrintf(sentry, "IPcache Negative Hits: %d\n",
+ storeAppendPrintf(sentry, "IPcache Negative Hits: %d\n",
IpcacheStats.negative_hits);
- storeAppendPrintf(sentry, "IPcache Misses: %d\n",
+ storeAppendPrintf(sentry, "IPcache Numeric Hits: %d\n",
+ IpcacheStats.numeric_hits);
+ storeAppendPrintf(sentry, "IPcache Misses: %d\n",
IpcacheStats.misses);
+ storeAppendPrintf(sentry, "IPcache Invalid Requests: %d\n",
+ IpcacheStats.invalid);
storeAppendPrintf(sentry, "\n\n");
storeAppendPrintf(sentry, "IP Cache Contents:\n\n");
storeAppendPrintf(sentry, " %-29.29s %3s %6s %6s %1s\n",
diff -ruN squid-2.6.STABLE14/src/logfile.c squid-2.6.STABLE15/src/logfile.c
--- squid-2.6.STABLE14/src/logfile.c Sat Sep 2 08:08:42 2006
+++ squid-2.6.STABLE15/src/logfile.c Tue Aug 21 18:03:39 2007
@@ -1,5 +1,5 @@
/*
- * $Id: logfile.c,v 1.20 2006/09/02 14:08:42 hno Exp $
+ * $Id: logfile.c,v 1.20.2.1 2007/08/22 00:03:39 hno Exp $
*
* DEBUG: section 50 Log file handling
* AUTHOR: Duane Wessels
@@ -107,7 +107,7 @@
syslog_symbol_t *p;
for (p = symbols; p->name != NULL; ++p)
- if (!strcmp(s, p->name) || !strcmp(s, p->name + 4))
+ if (!strcmp(s, p->name) || !strcasecmp(s, p->name + 4))
return p->value;
return 0;
}
@@ -126,7 +126,10 @@
lf->fd = -1;
if (path[6] != '\0') {
const char *priority = path + 7;
- char *facility = (char *) strchr(priority, '|');
+ char *facility = (char *) strchr(priority, '.');
+ if (!facility)
+ facility = (char *) strchr(priority, '|');
+
if (facility) {
*facility++ = '\0';
lf->syslog_priority |= syslog_ntoa(facility);
diff -ruN squid-2.6.STABLE14/src/main.c squid-2.6.STABLE15/src/main.c
--- squid-2.6.STABLE14/src/main.c Sat Jun 23 15:33:24 2007
+++ squid-2.6.STABLE15/src/main.c Fri Aug 31 07:52:10 2007
@@ -1,6 +1,6 @@
/*
- * $Id: main.c,v 1.393.2.3 2007/06/23 21:33:24 hno Exp $
+ * $Id: main.c,v 1.393.2.4 2007/08/31 13:52:10 hno Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
@@ -522,7 +522,7 @@
mainInitialize(void)
{
/* chroot if configured to run inside chroot */
- if (Config.chroot_dir && chroot(Config.chroot_dir)) {
+ if (Config.chroot_dir && (chroot(Config.chroot_dir) != 0 || chdir("/") != 0)) {
fatal("failed to chroot");
}
if (opt_catch_signals) {
diff -ruN squid-2.6.STABLE14/src/mib.txt squid-2.6.STABLE15/src/mib.txt
--- squid-2.6.STABLE14/src/mib.txt Thu Sep 21 20:49:24 2006
+++ squid-2.6.STABLE15/src/mib.txt Fri Aug 31 08:08:52 2007
@@ -2,7 +2,7 @@
SQUID-MIB DEFINITIONS ::= BEGIN
--
--- $Id: mib.txt,v 1.30 2006/09/22 02:49:24 hno Exp $
+-- $Id: mib.txt,v 1.30.2.1 2007/08/31 14:08:52 hno Exp $
--
IMPORTS
@@ -314,7 +314,7 @@
MAX-ACCESS read-only
STATUS current
DESCRIPTION
- " Number of HTTP KB's recieved "
+ " Number of HTTP KB's received "
::= { cacheProtoAggregateStats 4 }
cacheHttpOutKb OBJECT-TYPE
@@ -354,7 +354,7 @@
MAX-ACCESS read-only
STATUS current
DESCRIPTION
- " Number of ICP KB's recieved "
+ " Number of ICP KB's received "
::= { cacheProtoAggregateStats 9 }
cacheServerRequests OBJECT-TYPE
@@ -378,7 +378,7 @@
MAX-ACCESS read-only
STATUS current
DESCRIPTION
- " KB's of traffic recieved from servers "
+ " KB's of traffic received from servers "
::= { cacheProtoAggregateStats 12 }
cacheServerOutKb OBJECT-TYPE
diff -ruN squid-2.6.STABLE14/src/neighbors.c squid-2.6.STABLE15/src/neighbors.c
--- squid-2.6.STABLE14/src/neighbors.c Mon Feb 26 15:45:24 2007
+++ squid-2.6.STABLE15/src/neighbors.c Fri Aug 31 07:49:54 2007
@@ -1,6 +1,6 @@
/*
- * $Id: neighbors.c,v 1.313.2.1 2007/02/26 22:45:24 hno Exp $
+ * $Id: neighbors.c,v 1.313.2.2 2007/08/31 13:49:54 hno Exp $
*
* DEBUG: section 15 Neighbor Routines
* AUTHOR: Harvest Derived
@@ -1014,12 +1014,13 @@
debug(0, 0) ("WARNING: No IP address found for '%s'!\n", p->host);
return;
}
- p->tcp_up = PEER_TCP_MAGIC_COUNT;
for (j = 0; j < (int) ia->count && j < PEER_MAX_ADDRESSES; j++) {
p->addresses[j] = ia->in_addrs[j];
debug(15, 2) ("--> IP address #%d: %s\n", j, inet_ntoa(p->addresses[j]));
p->n_addresses++;
}
+ if (!p->tcp_up)
+ peerProbeConnect((peer *) p);
ap = &p->in_addr;
memset(ap, '\0', sizeof(struct sockaddr_in));
ap->sin_family = AF_INET;
diff -ruN squid-2.6.STABLE14/src/repl/Makefile.in squid-2.6.STABLE15/src/repl/Makefile.in
--- squid-2.6.STABLE14/src/repl/Makefile.in Fri Jun 22 18:14:58 2007
+++ squid-2.6.STABLE15/src/repl/Makefile.in Sun Aug 12 06:41:09 2007
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.38.2.1 2007/06/23 00:14:58 hno Exp $
+# $Id: Makefile.in,v 1.38.2.2 2007/08/12 12:41:09 hno Exp $
#
srcdir = @srcdir@
@@ -124,6 +124,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -216,8 +217,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -232,24 +231,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff -ruN squid-2.6.STABLE14/src/store.c squid-2.6.STABLE15/src/store.c
--- squid-2.6.STABLE14/src/store.c Mon Mar 26 17:14:10 2007
+++ squid-2.6.STABLE15/src/store.c Fri Aug 31 07:51:27 2007
@@ -1,6 +1,6 @@
/*
- * $Id: store.c,v 1.570.2.3 2007/03/26 23:14:10 hno Exp $
+ * $Id: store.c,v 1.570.2.4 2007/08/31 13:51:27 hno Exp $
*
* DEBUG: section 20 Storage Manager
* AUTHOR: Harvest Derived
@@ -945,7 +945,7 @@
state->buf = memAllocBuf(4096, &state->buf_size);
state->sc = storeClientRegister(state->e, state);
state->seen_offset = offset;
- if (strCmp(e->mem_obj->reply->content_type, "x-squid-internal/vary") != 0) {
+ if (!strLen(e->mem_obj->reply->content_type) || strCmp(e->mem_obj->reply->content_type, "x-squid-internal/vary") != 0) {
/* This is not our Vary marker object. Bail out. */
debug(33, 1) ("storeLocateVary: Not our vary marker object, %s = '%s', '%s'/'%s'\n",
storeKeyText(e->hash.key), e->mem_obj->url, vary_data, strBuf(accept_encoding) ? strBuf(accept_encoding) : "-");
diff -ruN squid-2.6.STABLE14/src/tools.c squid-2.6.STABLE15/src/tools.c
--- squid-2.6.STABLE14/src/tools.c Sat Jun 2 18:40:32 2007
+++ squid-2.6.STABLE15/src/tools.c Fri Aug 31 07:44:00 2007
@@ -1,6 +1,6 @@
/*
- * $Id: tools.c,v 1.250.2.1 2007/06/03 00:40:32 hno Exp $
+ * $Id: tools.c,v 1.250.2.2 2007/08/31 13:44:00 hno Exp $
*
* DEBUG: section 21 Misc Functions
* AUTHOR: Harvest Derived
@@ -40,7 +40,7 @@
#include "squid.h"
-#if LINUX_TPROXY
+#ifdef _SQUID_LINUX_
#undef _POSIX_SOURCE
/* Ugly glue to get around linux header madness colliding with glibc */
#define _LINUX_TYPES_H
@@ -70,6 +70,7 @@
extern void log_trace_done();
extern void log_trace_init(char *);
#endif
+static void restoreCapabilities(int keep);
#ifdef _SQUID_LINUX_
/* Workaround for crappy glic header files */
@@ -633,23 +634,7 @@
if (setuid(Config2.effectiveUserID) < 0)
debug(50, 0) ("ALERT: setuid: %s\n", xstrerror());
#endif
-#if LINUX_TPROXY
- if (need_linux_tproxy) {
- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t));
- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t));
-
- head->version = _LINUX_CAPABILITY_VERSION;
- head->pid = 0;
- cap->inheritable = cap->permitted = cap->effective = (1 << CAP_NET_ADMIN) + (1 << CAP_NET_BIND_SERVICE) + (1 << CAP_NET_BROADCAST);
- if (capset(head, cap) != 0) {
- xfree(head);
- xfree(cap);
- fatal("Error giving up capabilities");
- }
- xfree(head);
- xfree(cap);
- }
-#endif
+ restoreCapabilities(1);
/* Changing user ID usually blocks core dumps. Get them back! */
enableCoredumps();
}
@@ -677,14 +662,10 @@
leave_suid();
uid = geteuid();
debug(21, 3) ("no_suid: PID %d giving up root priveleges forever\n", (int) getpid());
-#if HAVE_SETRESUID
- if (setresuid(uid, uid, uid) < 0)
- debug(50, 1) ("no_suid: setresuid: %s\n", xstrerror());
-#else
setuid(0);
if (setuid(uid) < 0)
debug(50, 1) ("no_suid: setuid: %s\n", xstrerror());
-#endif
+ restoreCapabilities(0);
enableCoredumps();
}
@@ -1338,11 +1319,54 @@
void
keepCapabilities(void)
{
+#if HAVE_PRCTL && defined(PR_SET_KEEPCAPS)
+ if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) {
+ /* Silent failure unless TPROXY is required. Maybe not started as root */
#if LINUX_TPROXY
- if (need_linux_tproxy) {
- if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) {
+ if (need_linux_tproxy)
debug(1, 1) ("Error - tproxy support requires capability setting which has failed. Continuing without tproxy support\n");
- }
+ need_linux_tproxy = 0;
+#endif
+ }
+#endif
+}
+
+static void
+restoreCapabilities(int keep)
+{
+#ifdef _SQUID_LINUX_
+ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t));
+ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t));
+
+ head->version = _LINUX_CAPABILITY_VERSION;
+ if (capget(head, cap) != 0) {
+ debug(50, 1) ("Can't get current capabilities\n");
+ goto nocap;
+ }
+ if (head->version != _LINUX_CAPABILITY_VERSION) {
+ debug(50, 1) ("Invalid capability version %d (expected %d)\n", head->version, _LINUX_CAPABILITY_VERSION);
+ goto nocap;
+ }
+ head->pid = 0;
+
+ cap->inheritable = 0;
+ cap->effective = (1 << CAP_NET_BIND_SERVICE);
+#if LINUX_TPROXY
+ if (need_linux_tproxy)
+ cap->effective |= (1 << CAP_NET_ADMIN) | (1 << CAP_NET_BROADCAST);
+#endif
+ if (!keep)
+ cap->permitted &= cap->effective;
+ if (capset(head, cap) != 0) {
+ /* Silent failure unless TPROXY is required */
+#if LINUX_TPROXY
+ if (need_linux_tproxy)
+ debug(50, 1) ("Error enabling needed capabilities. Will continue without tproxy support\n");
+ need_linux_tproxy = 0;
+#endif
}
+ nocap:
+ xfree(head);
+ xfree(cap);
#endif
}
diff -ruN squid-2.6.STABLE14/src/win32.c squid-2.6.STABLE15/src/win32.c
--- squid-2.6.STABLE14/src/win32.c Sun Oct 29 01:21:50 2006
+++ squid-2.6.STABLE15/src/win32.c Fri Aug 31 08:06:15 2007
@@ -1,6 +1,6 @@
/*
- * $Id: win32.c,v 1.17 2006/10/29 08:21:50 serassio Exp $
+ * $Id: win32.c,v 1.17.2.1 2007/08/31 14:06:15 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio
@@ -54,9 +54,11 @@
static unsigned int GetOSVersion();
void WIN32_svcstatusupdate(DWORD, DWORD);
void WINAPI WIN32_svcHandler(DWORD);
+#if USE_WIN32_SERVICE
static int WIN32_StoreKey(const char *, DWORD, unsigned char *, int);
static int WIN32_create_key(void);
static void WIN32_build_argv(char *);
+#endif /* USE_WIN32_SERVICE */
void WINAPI SquidWinSvcMain(DWORD, char **);
#if defined(_SQUID_MSWIN_)
@@ -67,11 +69,14 @@
static LPTOP_LEVEL_EXCEPTION_FILTER Win32_Old_ExceptionHandler = NULL;
#endif /* _SQUID_MSWIN_ */
+#if USE_WIN32_SERVICE
static SERVICE_STATUS svcStatus;
static SERVICE_STATUS_HANDLE svcHandle;
+
static int WIN32_argc;
static char **WIN32_argv;
static char *WIN32_module_name;
+#endif /* USE_WIN32_SERVICE */
static int Squid_Aborting = 0;
#define VENDOR "GNU"
@@ -86,6 +91,7 @@
#else
#define CHANGESERVICECONFIG2 "ChangeServiceConfig2A"
#endif
+#if USE_WIN32_SERVICE
static SC_ACTION Squid_SCAction[] =
{
{SC_ACTION_RESTART, 60000}};
@@ -93,6 +99,7 @@
{SOFTWARENAME " " VERSION " " PACKAGE_NAME};
static SERVICE_FAILURE_ACTIONS Squid_ServiceFailureActions =
{INFINITE, NULL, NULL, 1, Squid_SCAction};
+
static char REGKEY[256] = "SOFTWARE\\" VENDOR "\\" SOFTWARENAME "\\" WIN32_VERSION "\\";
static char *keys[] =
{
@@ -103,11 +110,13 @@
NULL, /* key[4] */
NULL /* key[5] */
};
+#endif /* USE_WIN32_SERVICE */
/* ====================================================================== */
/* LOCAL FUNCTIONS */
/* ====================================================================== */
+#if USE_WIN32_SERVICE
static int
WIN32_create_key(void)
{
@@ -221,6 +230,7 @@
}
return retval;
}
+#endif /* USE_WIN32_SERVICE */
static unsigned int
GetOSVersion()
@@ -293,6 +303,7 @@
return _WIN_OS_UNKNOWN;
}
+#if USE_WIN32_SERVICE
/* Build argv, argc from string passed from Windows. */
static void
WIN32_build_argv(char *cmd)
@@ -329,6 +340,8 @@
}
WIN32_argv[WIN32_argc] = NULL;
}
+
+#endif
/* ====================================================================== */
/* PUBLIC FUNCTIONS */
diff -ruN squid-2.6.STABLE14/tools/Makefile.in squid-2.6.STABLE15/tools/Makefile.in
--- squid-2.6.STABLE14/tools/Makefile.in Fri Jun 22 18:14:59 2007
+++ squid-2.6.STABLE15/tools/Makefile.in Sun Aug 12 06:41:09 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.12.2.1 2007/06/23 00:14:59 hno Exp $
+# $Id: Makefile.in,v 1.12.2.2 2007/08/12 12:41:09 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -145,6 +145,7 @@
EXEEXT = @EXEEXT@
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
FALSE = @FALSE@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -237,8 +238,6 @@
XTRA_LIBS = @XTRA_LIBS@
XTRA_OBJS = @XTRA_OBJS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -253,24 +252,31 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
makesnmplib = @makesnmplib@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@