Sun Oct 17 15:31:11 CEST 1999
Modified Files in squid/src
	store.c store_dir_ufs.c 

Merged squid-2.2.STABLE4.rebuild_release.patch

Release unneeded store entries during cache rebuild.

a) Entries for proxied objects during the rebuild (squid runs in proxy-only
mode during the rebuild)

b) Old entries replaced with a newer entry during the rebuild.

-----------------------------------------------------------------

Index: squid/src/store.c
diff -u squid/src/store.c:1.1.1.40.2.4 squid/src/store.c:1.1.1.40.2.5
--- squid/src/store.c:1.1.1.40.2.4	Sun Oct 17 15:15:55 1999
+++ squid/src/store.c	Sun Oct 17 15:31:10 1999
@@ -939,12 +939,16 @@
 	    storeSetMemStatus(e, NOT_IN_MEMORY);
 	    destroy_MemObject(e);
 	}
-	/*
-	 * Fake a call to storeLockObject().  When rebuilding is done,
-	 * we'll just call storeUnlockObject() on these.
-	 */
-	e->lock_count++;
-	stackPush(&LateReleaseStack, e);
+	if (e->swap_file_number > -1) {
+	    /*
+	     * Fake a call to storeLockObject().  When rebuilding is done,
+	     * we'll just call storeUnlockObject() on these.
+	     */
+	    e->lock_count++;
+	    stackPush(&LateReleaseStack, e);
+	} else {
+	    destroy_StoreEntry(e);
+	}
 	return;
     }
     storeLog(STORE_LOG_RELEASE, e);
Index: squid/src/store_dir_ufs.c
diff -u squid/src/store_dir_ufs.c:1.1.1.2.2.3 squid/src/store_dir_ufs.c:1.1.1.2.2.4
--- squid/src/store_dir_ufs.c:1.1.1.2.2.3	Sun Oct 17 15:23:51 1999
+++ squid/src/store_dir_ufs.c	Sun Oct 17 15:31:10 1999
@@ -467,6 +467,7 @@
 		    storeDirMapBitReset(e->swap_file_number);
 		    e->swap_file_number = -1;
 		}
+		storeRelease(e);
 		rb->counts.objcount--;
 		rb->counts.cancelcount++;
 	    }