diff -N -c -r -X exclude_files squid-1.0.beta9/src/store.c squid-1.0.beta9.henrik/src/store.c
*** squid-1.0.beta9/src/store.c	Sun May 26 14:27:08 1996
--- squid-1.0.beta9.henrik/src/store.c	Sun May 26 14:26:12 1996
***************
*** 2156,2161 ****
--- 2156,2167 ----
  	    }
  	}
      }
+     if (store_is_rebuilding) {
+ 	storeExpireNow(e);
+ 	storeSetPrivateKey(e);
+ 	debug(20, 2, "storeRelease: Delaying release until store is rebuilt '%s'\n",e->key?e->key:e->url?e->url:"NO URL");
+ 	return -1;
+     }
      if (e->key)
  	debug(20, 5, "storeRelease: Release object key: %s\n", e->key);
      else
***************
*** 2583,2588 ****
--- 2589,2600 ----
      hash_link *link_ptr = NULL, *next = NULL;
      StoreEntry *e = NULL;
      int rm_obj = 0;
+ 
+     /* We can't delete objects while rebuilding swap */
+     if(store_is_rebuilding) {
+     	debug(20,3,"storeMaintainSwapSpace: Store is rebuilding.\n");
+ 	return -1;
+     }
  
      /* Scan row of hash table each second and free storage if we're
       * over the high-water mark */