patches to 2.0.PRE1

Some people asked for the patches I've made to PRE1

Index: ChangeLog
===================================================================
RCS file: /surf1/CVS/squid/ChangeLog,v
retrieving revision 1.433.2.2
retrieving revision 1.433.2.4
diff -u -r1.433.2.2 -r1.433.2.4
--- ChangeLog 1998/09/29 21:24:04 1.433.2.2
+++ ChangeLog 1998/10/02 03:22:07 1.433.2.4
@@ -36,6 +36,10 @@
           return all objects and not skip some.
         - Fixed netdbClosestParent() so it won't return sibling
           peers.
+ - Fixed a bug with secondary clients on entries with
+ ENTRY_BAD_LENGTH set. We should release the
+ bad entry to prevent secondary clients jumping on.
+ - Changed MIB to prevent parse warnings at startup.
 
 Changes to squid-1.2.beta25 (September 21, 1998):
 
Index: src/mib.txt
===================================================================
RCS file: /surf1/CVS/squid/src/mib.txt,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- mib.txt 1998/09/23 21:21:08 1.16
+++ mib.txt 1998/10/02 03:20:55 1.16.2.1
@@ -1,7 +1,8 @@
 SQUID-MIB DEFINITIONS ::= BEGIN
 --
--- $Id: mib.txt,v 1.16 1998/09/23 21:21:08 glenn Exp $
+-- $Id: mib.txt,v 1.16.2.1 1998/10/02 03:20:55 wessels Exp $
 --
+
 IMPORTS
         enterprises, Unsigned32, TimeTicks, Gauge32, Counter32,
         MODULE-IDENTITY, OBJECT-TYPE
@@ -37,9 +38,20 @@
                 "Move to SMIv2. Prepare to split into proxy/squid."
     ::= { nlanr 1 }
 
--- Do NOT remove the following line
-
 -- v 1.16 1998/09/22 glenn@ircache.net
+
+--
+-- This is a hack to get around a problem with the current
+-- version of the SNMP library. Remove the following seven lines
+-- before using with SNMP tools.
+--
+org OBJECT IDENTIFIER ::= { iso 1 }
+dod OBJECT IDENTIFIER ::= { org 6 }
+intenet OBJECT IDENTIFIER ::= { dod 1 }
+private OBJECT IDENTIFIER ::= { intenet 4 }
+enterprises OBJECT IDENTIFIER ::= { private 1 }
+nlanr OBJECT IDENTIFIER ::= { enterprises 3495 }
+squid OBJECT IDENTIFIER ::= { nlanr 1 }
 
 --
 -- OID Assignments
Index: src/store.c
===================================================================
RCS file: /surf1/CVS/squid/src/store.c,v
retrieving revision 1.464
retrieving revision 1.464.2.1
diff -u -r1.464 -r1.464.2.1
--- store.c 1998/09/21 07:01:26 1.464
+++ store.c 1998/10/01 21:18:10 1.464.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.c,v 1.464 1998/09/21 07:01:26 wessels Exp $
+ * $Id: store.c,v 1.464.2.1 1998/10/01 21:18:10 wessels Exp $
  *
  * DEBUG: section 20 Storage Manager
  * AUTHOR: Harvest Derived
@@ -566,8 +566,10 @@
     e->mem_obj->object_sz = e->mem_obj->inmem_hi;
     e->store_status = STORE_OK;
     assert(e->mem_status == NOT_IN_MEMORY);
- if (!storeEntryValidLength(e))
+ if (!storeEntryValidLength(e)) {
         EBIT_SET(e->flags, ENTRY_BAD_LENGTH);
+ storeReleaseRequest(e);
+ }
 #if USE_CACHE_DIGESTS
     if (e->mem_obj->request)
         e->mem_obj->request->hier.store_complete_stop = current_time;
Received on Tue Jul 29 2003 - 13:15:54 MDT