From: wessels <>
Date: Sun, 13 Oct 1996 16:04:19 +0000 (+0000)
Subject: Linked ftpget with debug.o and removed lib/debug.c, lib/log.c
X-Git-Tag: SQUID_3_0_PRE1~5665
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2b8bf57c28ebfd1fbcbb3cadfdd596ae56bbb18;p=thirdparty%2Fsquid.git

Linked ftpget with debug.o and removed lib/debug.c, lib/log.c
---

diff --git a/ChangeLog b/ChangeLog
index f4c28c4cf3..8f856ba10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,19 +16,26 @@ TODO LIST before official squid-1.1:
 Changes to squid-1.1.beta7 ():
 
 	- Combined and renamed comm_set_select_handler() functions.
+	- Fixed netdbPingSite() not checking n->next_ping_time.
+	- Fixed acl.c to use regular gethostbyname() because IP cache
+	  isn't initialized while reading config file.
+	- Linked ftpget with debug.o and removed lib/debug.c,
+	  lib/log.c.
 
 Changes to squid-1.1.beta6 ():
 
 	- Fixed lots of function prototypes, etc (Ed Knowles).
 	- Added multicast patch (Martin Hamilton).
-	- Replaced 'struct hostent' with 'struct ipcache_addrs' in IP cache.
+	- Replaced 'struct hostent' with 'struct ipcache_addrs' in IP
+	  cache.
 	- Added ipcacheCycleAddrs() to round-robin IP addresses.
-	- Added ipcacheRemoveBadAddr() to remove addresses from failed connect()'s.
-	- Changed comm_connect() to comm_nbconnect() and removed other nonblocking
-	  connection handling code from other modules.
-	- Improved cache memory usage.  Now cache_mem specifies the size
-	  of the in-memory data pool.  Hot objects use whatever space is
-	  not used by in-transit objects.
+	- Added ipcacheRemoveBadAddr() to remove addresses from failed
+	  connect()'s.
+	- Changed comm_connect() to comm_nbconnect() and removed other
+	  nonblocking connection handling code from other modules.
+	- Improved cache memory usage.  Now cache_mem specifies the
+	  size of the in-memory data pool.  Hot objects use whatever
+	  space is not used by in-transit objects.
 	- Removed 'max_hot_object_size' config option.
 	- Fixed virtual-host coredump bug (Aaron Hopkins).
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3b01a30d0b..0645e201c7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,7 +3,7 @@
 #
 #  Darren Hardy, hardy@cs.colorado.edu, April 1994
 #
-#  $Id: Makefile.in,v 1.14 1996/09/17 02:29:44 wessels Exp $
+#  $Id: Makefile.in,v 1.15 1996/10/13 10:04:20 wessels Exp $
 #
 prefix		= @prefix@
 srcdir		= @srcdir@
@@ -25,8 +25,6 @@ UTILOBJS	= rfc850.o \
 		  rfc1738.o \
 		  util.o \
 		  getfullhostname.o \
-		  debug.o \
-		  log.o \
 		  tempnam.o \
 		  base64.o \
 		  uudecode.o
diff --git a/src/Makefile.in b/src/Makefile.in
index 4526cd1b2a..193466c844 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.45 1996/09/24 18:50:04 wessels Exp $
+#  $Id: Makefile.in,v 1.46 1996/10/13 10:04:21 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -97,7 +97,7 @@ cachemgr.cgi:	cachemgr.o
 	$(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS)
 
 ftpget: ftpget.o
-	$(CC) -o $@ $(LDFLAGS) ftpget.o $(LIBS)
+	$(CC) -o $@ $(LDFLAGS) ftpget.o debug.o $(LIBS)
 
 pinger: pinger.o
 	$(CC) -o $@ $(LDFLAGS) pinger.o debug.o $(LIBS)