ViewMTN: Diff from [cf48f9a1..] to [812a98e1..]

ViewMTN — Everything : Branches | Tags | Help | About | Change DB
Revision [cf48f9a1..]: Info | Browse Files | Download (tar)
The unified diff between revisions [cf48f9a1..] and [812a98e1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "ChangeLog"
#  from [2f77d8decee25c8a8e7fde626fbd4f8e34478b9f]
#    to [e42ce65c01fb05311e26c1deefec1e6324f19ab0]
#
# patch "configure"
#  from [fe7b14e39fbca3cd2be4053b0fbb168be835d427]
#    to [584f73666d976efba48349091775b861031a60b4]
#
# patch "configure.in"
#  from [bcecf942d8a7da536c4b143fdc55ac51456a5cbf]
#    to [97beba71bff3de87f7cef0b9f9799a31f8ccc6da]
#
# patch "doc/release-notes/release-2.5.html"
#  from [7021426e73a74a0a9aa3f8d0f74f9539ffec2a3f]
#    to [64899431d4bb8e5fc302f18f32c592e29c3dad01]
#
# patch "doc/release-notes/release-2.5.sgml"
#  from [3f5598b28a57332fd449896cd6ff4b64e0cc44ac]
#    to [865cc6b4cf921c99d35ef29681f7ec2cef325b7b]
#
# patch "include/util.h"
#  from [edf1b2109126a7328a6ee44945548f940e127110]
#    to [b475a7454522d99800730aa5430bf689068db00f]
#
# patch "src/HttpHeader.c"
#  from [f130fccd6139140980f19965058577fb573780f7]
#    to [0982fee1caff18c52a2426a4744d5c7362e32d12]
#
# patch "src/htcp.c"
#  from [97c792f6669a6be08a8f04689305aeac8e50cb31]
#    to [65577c9527724355c34983ac3658713dc6dc28fe]
#
# patch "src/ident.c"
#  from [6e57371ab0ec95bd089a1f59967c73d30da86df9]
#    to [009e9efd8355bf3d25506637a1b17b65e24589ef]
#
# patch "src/internal.c"
#  from [246507180f32f02dea3fd7887ec9dbfce09b73b1]
#    to [9093478b8b63d91fcb5f2c05f533bd9ae48cf926]
#
============================================================
--- ChangeLog	2f77d8decee25c8a8e7fde626fbd4f8e34478b9f
+++ ChangeLog	e42ce65c01fb05311e26c1deefec1e6324f19ab0
@@ -1,4 +1,13 @@
-Changes to squid-2.5.STABLE12 (12 Mar 2006)
+Changes to squid-2.5.STABLE14 (not yet released)
+	- [Minor] icons not displayed when visible_hostname is a
+	  short hostname (witout domain). (Bug #1532)
+	- [Medium] Memleak in HTCP client code (default disabled)
+	  (Bug #1553)
+	- [Major] memory leak in ident processing (Bug #1557)
+	- [Medium] Memory leak in header processing related to external_acl
+	  header detail format tag
+
+Changes to squid-2.5.STABLE13 (12 Mar 2006)
 	- [Minor] Fails to compile on Solaris and some other platforms
 	  with undefined reference to setenv (Bug #1435)
 	- [Cosmetic] Added WebDAV REPORT method to know HTTP methods list
============================================================
--- configure	fe7b14e39fbca3cd2be4053b0fbb168be835d427
+++ configure	584f73666d976efba48349091775b861031a60b4
@@ -1078,7 +1078,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst



-# From configure.in Revision: 1.251.2.107
+# From configure.in Revision: 1.251.2.108
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
 echo "configure:1084: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -7474,7 +7474,7 @@ if test "$with_aio" = "yes"; then
 fi

 if test "$with_aio" = "yes"; then
-    echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6
+        echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6
 echo "configure:7479: checking for aio_read in -lrt" >&5
 ac_lib_var=`echo rt'_'aio_read | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -7519,14 +7519,61 @@ else

 else
   echo "$ac_t""no" 1>&6
+echo $ac_n "checking for aio_read in -laio""... $ac_c" 1>&6
+echo "configure:7524: checking for aio_read in -laio" >&5
+ac_lib_var=`echo aio'_'aio_read | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-laio  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7532 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char aio_read();
+
+int main() {
+aio_read()
+; return 0; }
+EOF
+if { (eval echo configure:7543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"

 fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo aio | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF

+  LIBS="-laio $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+fi
+
 case "$host" in
 	*-pc-sco3.2*)
 		echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:7530: checking for strftime in -lintl" >&5
+echo "configure:7577: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7534,7 +7581,7 @@ cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7538 "configure"
+#line 7585 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7545,7 +7592,7 @@ EOF
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:7549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7576,7 +7623,7 @@ echo $ac_n "checking for main in -llber"
 esac

 echo $ac_n "checking for main in -llber""... $ac_c" 1>&6
-echo "configure:7580: checking for main in -llber" >&5
+echo "configure:7627: checking for main in -llber" >&5
 ac_lib_var=`echo lber'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7584,14 +7631,14 @@ cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-llber  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7588 "configure"
+#line 7635 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7779,12 +7826,12 @@ echo $ac_n "checking for $ac_func""... $

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7783: checking for $ac_func" >&5
+echo "configure:7830: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7788 "configure"
+#line 7835 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7807,7 +7854,7 @@ EOF

 ; return 0; }
 EOF
-if { (eval echo configure:7811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7833,7 +7880,7 @@ echo $ac_n "checking if setresuid is imp


 echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6
-echo "configure:7837: checking if setresuid is implemented" >&5
+echo "configure:7884: checking if setresuid is implemented" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setresuid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7841,7 +7888,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 7845 "configure"
+#line 7892 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -7854,7 +7901,7 @@ EOF
   }

 EOF
-if { (eval echo configure:7858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setresuid="yes"
 else
@@ -7899,7 +7946,7 @@ echo $ac_n "checking if va_copy is imple
 fi

 echo $ac_n "checking if va_copy is implemented""... $ac_c" 1>&6
-echo "configure:7903: checking if va_copy is implemented" >&5
+echo "configure:7950: checking if va_copy is implemented" >&5
 if eval "test \"`echo '$''{'ac_cv_func_va_copy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7907,7 +7954,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 7911 "configure"
+#line 7958 "configure"
 #include "confdefs.h"

       #include <stdarg.h>
@@ -7925,7 +7972,7 @@ EOF
       }

 EOF
-if { (eval echo configure:7929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_va_copy="yes"
 else
@@ -7949,7 +7996,7 @@ echo $ac_n "checking if __va_copy is imp
 fi

 echo $ac_n "checking if __va_copy is implemented""... $ac_c" 1>&6
-echo "configure:7953: checking if __va_copy is implemented" >&5
+echo "configure:8000: checking if __va_copy is implemented" >&5
 if eval "test \"`echo '$''{'ac_cv_func___va_copy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7957,7 +8004,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 7961 "configure"
+#line 8008 "configure"
 #include "confdefs.h"

       #include <stdarg.h>
@@ -7975,7 +8022,7 @@ EOF
       }

 EOF
-if { (eval echo configure:7979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func___va_copy="yes"
 else
@@ -8000,7 +8047,7 @@ if test "$IPF_TRANSPARENT" ; then

 if test "$IPF_TRANSPARENT" ; then
     echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6
-echo "configure:8004: checking if IP-Filter header files are installed" >&5
+echo "configure:8051: checking if IP-Filter header files are installed" >&5
     # hold on to your hats...
     if test "$ac_cv_header_ip_compat_h" = "yes" ||
         test "$ac_cv_header_ip_fil_compat_h" = "yes" ||
@@ -8050,7 +8097,7 @@ if test "$PF_TRANSPARENT" ; then

 if test "$PF_TRANSPARENT" ; then
     echo $ac_n "checking if PF header file is installed""... $ac_c" 1>&6
-echo "configure:8054: checking if PF header file is installed" >&5
+echo "configure:8101: checking if PF header file is installed" >&5
     # hold on to your hats...
     if test "$ac_cv_header_net_pfvar_h" = "yes"; then
         PF_TRANSPARENT="yes"
@@ -8075,7 +8122,7 @@ if test "$LINUX_NETFILTER" ; then

 if test "$LINUX_NETFILTER" ; then
     echo $ac_n "checking if Linux 2.4 kernel header files are installed""... $ac_c" 1>&6
-echo "configure:8079: checking if Linux 2.4 kernel header files are installed" >&5
+echo "configure:8126: checking if Linux 2.4 kernel header files are installed" >&5
     # hold on to your hats...
     if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes"; then
         LINUX_NETFILTER="yes"
@@ -8109,13 +8156,13 @@ echo $ac_n "checking if GNUregex needs t
     esac
 fi
 echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6
-echo "configure:8113: checking if GNUregex needs to be compiled" >&5
+echo "configure:8160: checking if GNUregex needs to be compiled" >&5
 if test -z "$USE_GNUREGEX"; then
 if test "$ac_cv_func_regcomp" = "no" || test "$USE_GNUREGEX" = "yes" ; then
 	USE_GNUREGEX="yes"
 else
 	cat > conftest.$ac_ext <<EOF
-#line 8119 "configure"
+#line 8166 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <regex.h>
@@ -8123,7 +8170,7 @@ EOF
 regex_t t; regcomp(&t,"",0);
 ; return 0; }
 EOF
-if { (eval echo configure:8127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   USE_GNUREGEX="no"
 else
@@ -8155,12 +8202,12 @@ echo $ac_n "checking for $ac_func""... $

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8159: checking for $ac_func" >&5
+echo "configure:8206: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8164 "configure"
+#line 8211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8183,7 +8230,7 @@ EOF

 ; return 0; }
 EOF
-if { (eval echo configure:8187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8211,12 +8258,12 @@ echo $ac_n "checking Default FD_SETSIZE


 echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6
-echo "configure:8215: checking Default FD_SETSIZE value" >&5
+echo "configure:8262: checking Default FD_SETSIZE value" >&5
 if test "$cross_compiling" = yes; then
   DEFAULT_FD_SETSIZE=256
 else
   cat > conftest.$ac_ext <<EOF
-#line 8220 "configure"
+#line 8267 "configure"
 #include "confdefs.h"

 #if HAVE_STDIO_H
@@ -8241,7 +8288,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   DEFAULT_FD_SETSIZE=`cat conftestval`
 else
@@ -8278,7 +8325,7 @@ echo $ac_n "checking Maximum number of f
 if test -z "$SQUID_MAXFD"; then

 echo $ac_n "checking Maximum number of filedescriptors we can open""... $ac_c" 1>&6
-echo "configure:8282: checking Maximum number of filedescriptors we can open" >&5
+echo "configure:8329: checking Maximum number of filedescriptors we can open" >&5
 TLDFLAGS="$LDFLAGS"
 case $host in
 i386-unknown-freebsd*)
@@ -8290,7 +8337,7 @@ else
   SQUID_MAXFD=256
 else
   cat > conftest.$ac_ext <<EOF
-#line 8294 "configure"
+#line 8341 "configure"
 #include "confdefs.h"

 #include <stdio.h>
@@ -8350,7 +8397,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SQUID_MAXFD=`cat conftestval`
 else
@@ -8378,12 +8425,12 @@ echo $ac_n "checking Default UDP send bu
 LDFLAGS="$TLDFLAGS"

 echo $ac_n "checking Default UDP send buffer size""... $ac_c" 1>&6
-echo "configure:8382: checking Default UDP send buffer size" >&5
+echo "configure:8429: checking Default UDP send buffer size" >&5
 if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=16384
 else
   cat > conftest.$ac_ext <<EOF
-#line 8387 "configure"
+#line 8434 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8404,7 +8451,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SQUID_UDP_SO_SNDBUF=`cat conftestval`
 else
@@ -8423,12 +8470,12 @@ echo $ac_n "checking Default UDP receive


 echo $ac_n "checking Default UDP receive buffer size""... $ac_c" 1>&6
-echo "configure:8427: checking Default UDP receive buffer size" >&5
+echo "configure:8474: checking Default UDP receive buffer size" >&5
 if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=16384
 else
   cat > conftest.$ac_ext <<EOF
-#line 8432 "configure"
+#line 8479 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8449,7 +8496,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SQUID_UDP_SO_RCVBUF=`cat conftestval`
 else
@@ -8468,12 +8515,12 @@ echo $ac_n "checking Default TCP send bu


 echo $ac_n "checking Default TCP send buffer size""... $ac_c" 1>&6
-echo "configure:8472: checking Default TCP send buffer size" >&5
+echo "configure:8519: checking Default TCP send buffer size" >&5
 if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=16384
 else
   cat > conftest.$ac_ext <<EOF
-#line 8477 "configure"
+#line 8524 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8494,7 +8541,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SQUID_TCP_SO_SNDBUF=`cat conftestval`
 else
@@ -8517,12 +8564,12 @@ echo $ac_n "checking Default TCP receive


 echo $ac_n "checking Default TCP receive buffer size""... $ac_c" 1>&6
-echo "configure:8521: checking Default TCP receive buffer size" >&5
+echo "configure:8568: checking Default TCP receive buffer size" >&5
 if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=16384
 else
   cat > conftest.$ac_ext <<EOF
-#line 8526 "configure"
+#line 8573 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8543,7 +8590,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SQUID_TCP_SO_RCVBUF=`cat conftestval`
 else
@@ -8565,19 +8612,19 @@ echo $ac_n "checking if sys_errlist is a
 EOF

 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
-echo "configure:8569: checking if sys_errlist is already defined" >&5
+echo "configure:8616: checking if sys_errlist is already defined" >&5
 if eval "test \"`echo '$''{'ac_cv_needs_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8574 "configure"
+#line 8621 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 char *s = sys_errlist;
 ; return 0; }
 EOF
-if { (eval echo configure:8581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_needs_sys_errlist="no"
 else
@@ -8599,16 +8646,16 @@ echo $ac_n "checking for libresolv _dns_
 fi

 echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6
-echo "configure:8603: checking for libresolv _dns_ttl_ hack" >&5
+echo "configure:8650: checking for libresolv _dns_ttl_ hack" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8605 "configure"
+#line 8652 "configure"
 #include "confdefs.h"
 extern int _dns_ttl_;
 int main() {
 return _dns_ttl_;
 ; return 0; }
 EOF
-if { (eval echo configure:8612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -8624,12 +8671,12 @@ echo $ac_n "checking if inet_ntoa() actu
 rm -f conftest*

 echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6
-echo "configure:8628: checking if inet_ntoa() actually works" >&5
+echo "configure:8675: checking if inet_ntoa() actually works" >&5
 if test "$cross_compiling" = yes; then
   INET_NTOA_RESULT="broken"
 else
   cat > conftest.$ac_ext <<EOF
-#line 8633 "configure"
+#line 8680 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8648,7 +8695,7 @@ EOF
 }

 EOF
-if { (eval echo configure:8652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   INET_NTOA_RESULT=`cat conftestval`
 else
@@ -8674,9 +8721,9 @@ echo $ac_n "checking for working statvfs

 if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then
 echo $ac_n "checking for working statvfs() interface""... $ac_c" 1>&6
-echo "configure:8678: checking for working statvfs() interface" >&5
+echo "configure:8725: checking for working statvfs() interface" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8680 "configure"
+#line 8727 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -8693,7 +8740,7 @@ EOF

 ; return 0; }
 EOF
-if { (eval echo configure:8697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_func_statvfs=yes
 else
@@ -8713,12 +8760,12 @@ echo $ac_n "checking for _res.nsaddr_lis
 fi

 echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6
-echo "configure:8717: checking for _res.nsaddr_list" >&5
+echo "configure:8764: checking for _res.nsaddr_list" >&5
 if eval "test \"`echo '$''{'ac_cv_have_res_nsaddr_list'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8722 "configure"
+#line 8769 "configure"
 #include "confdefs.h"

 #if HAVE_SYS_TYPES_H
@@ -8741,7 +8788,7 @@ EOF
 _res.nsaddr_list[0];
 ; return 0; }
 EOF
-if { (eval echo configure:8745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_res_nsaddr_list="yes"
 else
@@ -8763,12 +8810,12 @@ echo $ac_n "checking for _res.ns_list"".

 if test $ac_cv_have_res_nsaddr_list = "no" ; then
 echo $ac_n "checking for _res.ns_list""... $ac_c" 1>&6
-echo "configure:8767: checking for _res.ns_list" >&5
+echo "configure:8814: checking for _res.ns_list" >&5
 if eval "test \"`echo '$''{'ac_cv_have_res_ns_list'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8772 "configure"
+#line 8819 "configure"
 #include "confdefs.h"

 #if HAVE_SYS_TYPES_H
@@ -8791,7 +8838,7 @@ EOF
 _res.ns_list[0].addr;
 ; return 0; }
 EOF
-if { (eval echo configure:8795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_res_ns_list="yes"
 else
============================================================
--- configure.in	bcecf942d8a7da536c4b143fdc55ac51456a5cbf
+++ configure.in	97beba71bff3de87f7cef0b9f9799a31f8ccc6da
@@ -3,7 +3,7 @@ dnl
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.251.2.107 2006/03/12 11:19:07 hno Exp $
+dnl  $Id: configure.in,v 1.251.2.108 2006/05/12 19:35:27 serassio Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE13-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.251.2.107 $)dnl
+AC_REVISION($Revision: 1.251.2.108 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE

@@ -1669,7 +1669,8 @@ if test "$with_aio" = "yes"; then
 dnl Check for librt
 dnl We use AIO in the coss store
 if test "$with_aio" = "yes"; then
-    AC_CHECK_LIB(rt, aio_read)
+    dnl On some systems POSIX AIO functions are in libaio
+    AC_CHECK_LIB(rt, aio_read,,AC_CHECK_LIB(aio, aio_read))
 fi

 dnl -lintl is needed on SCO version 3.2v4.2 for strftime()
============================================================
--- doc/release-notes/release-2.5.html	7021426e73a74a0a9aa3f8d0f74f9539ffec2a3f
+++ doc/release-notes/release-2.5.html	64899431d4bb8e5fc302f18f32c592e29c3dad01
@@ -2,12 +2,12 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 2.5.STABLE12 release notes</TITLE>
+ <TITLE>Squid 2.5.STABLE14 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 2.5.STABLE12 release notes</H1>
+<H1>Squid 2.5.STABLE14 release notes</H1>

-<H2>Squid Developers</H2>$Id: release-2.5.html,v 1.1.2.68 2006/03/12 11:04:41 hno Exp $
+<H2>Squid Developers</H2>$Id: release-2.5.html,v 1.1.2.69 2006/05/14 15:30:39 hno Exp $
 <HR>
 <EM>This document contains the release notes for version 2.5 of Squid.
 Squid is a WWW Cache application developed by the National Laboratory
@@ -487,5 +487,16 @@ filedescriptor limit test
 </UL>
 </P>

+<H2><A NAME="s16">16. Key changes squid-2.5.STABLE13 to 2.5.STABLE14:</A></H2>
+
+<P>
+<UL>
+<LI>Several memory leaks plugged in ident, htcp and external_acl</LI>
+<LI>a number of other minor and cosmetic bugfixes. See the list of
+<A HREF="http://www.squid-cache.org/Versions/v2/2.5/bugs/#STABLE13">squid-2.5.STABLE13 patches</A> and the
+<A HREF="ChangeLog">ChangeLog</A> file for details.</LI>
+</UL>
+</P>
+
 </BODY>
 </HTML>
============================================================
--- doc/release-notes/release-2.5.sgml	3f5598b28a57332fd449896cd6ff4b64e0cc44ac
+++ doc/release-notes/release-2.5.sgml	865cc6b4cf921c99d35ef29681f7ec2cef325b7b
@@ -1,8 +1,8 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 2.5.STABLE12 release notes</title>
+<title>Squid 2.5.STABLE14 release notes</title>
 <author>Squid Developers</author>
-<date>$Id: release-2.5.sgml,v 1.1.2.82 2006/03/12 11:04:41 hno Exp $</date>
+<date>$Id: release-2.5.sgml,v 1.1.2.83 2006/05/14 15:30:39 hno Exp $</date>

 <abstract>
 This document contains the release notes for version 2.5 of Squid.
@@ -452,5 +452,16 @@ name="ChangeLog"> file for details.
 	name="ChangeLog"> file for details.
 </itemize>

+<sect>Key changes squid-2.5.STABLE13 to 2.5.STABLE14:
+
+<p>
+<itemize>
+	<item>Several memory leaks plugged in ident, htcp and external_acl
+	<item>a number of other minor and cosmetic bugfixes. See the list of <url
+	url="http://www.squid-cache.org/Versions/v2/2.5/bugs/#STABLE13"
+	name="squid-2.5.STABLE13 patches"> and the <url url="ChangeLog"
+	name="ChangeLog"> file for details.
+</itemize>
+
 </article>

============================================================
--- include/util.h	edf1b2109126a7328a6ee44945548f940e127110
+++ include/util.h	b475a7454522d99800730aa5430bf689068db00f
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.62 2001/10/17 01:36:07 hno Exp $
+ * $Id: util.h,v 1.62.2.1 2006/05/12 15:54:56 hno Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -45,17 +45,8 @@
 #endif

 #if !defined(SQUIDHOSTNAMELEN)
-#include <sys/param.h>
-#ifndef _SQUID_NETDB_H_		/* need protection on NEXTSTEP */
-#define _SQUID_NETDB_H_
-#include <netdb.h>
+#define SQUIDHOSTNAMELEN 256
 #endif
-#if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 128)
-#define SQUIDHOSTNAMELEN 128
-#else
-#define SQUIDHOSTNAMELEN MAXHOSTNAMELEN
-#endif
-#endif

 #if defined(_SQUID_FREEBSD_)
 #define _etext etext
============================================================
--- src/HttpHeader.c	f130fccd6139140980f19965058577fb573780f7
+++ src/HttpHeader.c	0982fee1caff18c52a2426a4744d5c7362e32d12
@@ -1,6 +1,6 @@

 /*
- * $Id: HttpHeader.c,v 1.74.2.31 2006/02/25 23:07:49 hno Exp $
+ * $Id: HttpHeader.c,v 1.74.2.32 2006/05/12 16:17:35 hno Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -798,6 +798,7 @@ httpHeaderGetByNameListMember(const Http
 	    break;
 	}
     }
+    stringClean(&header);
     return result;
 }

============================================================
--- src/htcp.c	97c792f6669a6be08a8f04689305aeac8e50cb31
+++ src/htcp.c	65577c9527724355c34983ac3658713dc6dc28fe
@@ -1,6 +1,6 @@

 /*
- * $Id: htcp.c,v 1.38.2.6 2005/03/26 02:50:53 hno Exp $
+ * $Id: htcp.c,v 1.38.2.7 2006/05/12 15:58:50 hno Exp $
  *
  * DEBUG: section 31    Hypertext Caching Protocol
  * AUTHOR: Duane Wesssels
@@ -598,6 +598,9 @@ htcpTstReply(htcpDataHeader * dhdr, Stor
 	packerClean(&p);
     }
     pkt = htcpBuildPacket(&stuff, &pktlen);
+    safe_free(stuff.D.resp_hdrs);
+    safe_free(stuff.D.entity_hdrs);
+    safe_free(stuff.D.cache_hdrs);
     if (pkt == NULL) {
 	debug(31, 0) ("htcpTstReply: htcpBuildPacket() failed\n");
 	return;
============================================================
--- src/ident.c	6e57371ab0ec95bd089a1f59967c73d30da86df9
+++ src/ident.c	009e9efd8355bf3d25506637a1b17b65e24589ef
@@ -1,6 +1,6 @@

 /*
- * $Id: ident.c,v 1.58 2001/04/14 00:03:23 hno Exp $
+ * $Id: ident.c,v 1.58.2.1 2006/05/12 16:00:31 hno Exp $
  *
  * DEBUG: section 30    Ident (RFC 931)
  * AUTHOR: Duane Wessels
@@ -85,6 +85,7 @@ identClose(int fdnotused, void *data)
     identCallback(state, NULL);
     comm_close(state->fd);
     hash_remove_link(ident_hash, (hash_link *) state);
+    safe_free(state->hash.key);
     cbdataFree(state);
 }

============================================================
--- src/internal.c	246507180f32f02dea3fd7887ec9dbfce09b73b1
+++ src/internal.c	9093478b8b63d91fcb5f2c05f533bd9ae48cf926
@@ -1,6 +1,6 @@

 /*
- * $Id: internal.c,v 1.23.2.2 2006/03/10 22:43:37 hno Exp $
+ * $Id: internal.c,v 1.23.2.3 2006/05/12 15:57:23 hno Exp $
  *
  * DEBUG: section 76    Internal Squid Object handling
  * AUTHOR: Duane, Alex, Henrik
@@ -135,6 +135,9 @@ internalHostname(void)
 {
     LOCAL_ARRAY(char, host, SQUIDHOSTNAMELEN + 1);
     xstrncpy(host, getMyHostname(), SQUIDHOSTNAMELEN);
+    if (Config.appendDomain && !strchr(host, '.'))
+	strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN -
+	    strlen(host) - 1);
     Tolower(host);
     return host;
 }