update

diff --git a/ChangeLog b/ChangeLog
index 1b6ba2b58a98d2432209cd548e1275d5d780ccf9..7c94ef64381f4773229eda84f41b0de35d860811 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@ Changes to squid-1.1.7 (February @@@, 1997):
        - Moved 'append_domain' operation to urlParse().
        - Fixed too many arguments bug in diskHandleWrite, caused
          coredumps when write fails (due to full disk).
+       - Fixed extra unlocking on partial reads from dnsservers.
+       - Fixes for 'Splay' trees in acl.c (Ed Knowles)
+       - Support for balanced binary trees in acl.c (Arjan de Vet).
 
 Changes to squid-1.novm.6 (February 7, 1997):
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 01fde6b4539d055b8469ef5edbb29fe2d4c0a183..1c157f7d6d57e58dd094382a4a7dcad0e22308b3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.62 1996/12/06 17:53:57 wessels Exp $
+#  $Id: Makefile.in,v 1.63 1997/02/20 21:09:04 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -14,9 +14,15 @@ USERAGENT_OPT        = # -DUSE_USERAGENT_LOG=1
 KILL_PARENT_OPT        = # -DKILL_PARENT_OPT
 USE_POLL_OPT    = # -DUSE_POLL
 ANON_OPT        = # -DUSE_ANONYMIZER
+#
+# do NOT define both USE_SPLAY_TREE and USE_BIN_TREE, only 1 at a time!
+#
+USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
+USE_BIN_TREE    = # -DUSE_BIN_TREE
 DEFINES         = $(HOST_OPT) $(AUTH_OPT) $(LOG_HDRS_OPT) \
                   $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
-                  $(KILL_PARENT_OPT) $(USE_POLL_OPT) $(ANON_OPT)
+                  $(KILL_PARENT_OPT) $(USE_POLL_OPT) $(ANON_OPT) \
+                  $(USE_SPLAY_TREE) $(USE_BIN_TREE)
 
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
@@ -109,8 +115,8 @@ OBJS                = \
                storetoString.o \
                tools.o \
                url.o \
-               wais.o \
                useragent.o \
+               wais.o \
                $(XTRA_OBJS)
 
 DEFAULTS        = \