1.1.5 mergeola

diff --git a/ChangeLog b/ChangeLog
index 2363e218c8560903f3170c0d7aa4a760ea473b8d..0c6d54ee5860567dbab8247f64e548478f4f57cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,7 @@
-       - Fix redirector to make sure the redirector child process is 
-         is alive and not busy before using it (Brent Foster).
-       - Fixed ACL joining bug.
-       - Fixed ftpget to properly handle multi-line replies that
-         don't begin with "NNN-".
-       - Changed store maintenance to randomize bucket order
-         each time after completion.
-       - Set RLIMIT_VMEM to the maximum.
-       - Syntax change: "edge" to "peer" everywhere.
-       - Change redirector stats to also show number of rewritten
-         requests (Andrew Humphrey).
-       - Changed HTTP anonmyizing to remove 'denied' headers
-         by default.  Define USE_PARANOID_ANONYMIZER to only pass
-         'allowed' headers instead.
-       - Added 'Splay' trees for fast IP access checking (Ed Knowles).
-       - Fixed 'COMM_INPROGRESS' typo bug (Balint Nagy Endre).
-       - Added support for PURGE method to remove cached objects.
+Changes to squid-1.novm.5 (February XX, 1996):
+
+       - Fixed stuck objects (and FD leak) due to not unlocking
+         objects in storeAbort().
 
 Changes to squid-1.1.5 (January 22, 1996):
 

diff --git a/configure b/configure
index 7618c5331c9602babce67bc20bd9998e9ba758fd..d35aaaa196782b9d790dc573501f9999808d349e 100755 (executable)
--- a/configure
+++ b/configure
@@ -516,7 +516,7 @@ fi
 
 
 
-# From configure.in Revision: 1.66 
+# From configure.in Revision: 1.67 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then