From: wessels <>
Date: Tue, 4 Feb 1997 13:33:56 +0000 (+0000)
Subject: 1.1.5 mergeola
X-Git-Tag: SQUID_3_0_PRE1~5145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c95a07811f517e283181750b0b474f8e650ed54c;p=thirdparty%2Fsquid.git

1.1.5 mergeola
---

diff --git a/ChangeLog b/ChangeLog
index 2363e218c8..0c6d54ee58 100644
--- 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 7618c5331c..d35aaaa196 100755
--- 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