---------------------
PatchSet 10302 
Date: 2007/12/22 15:11:32
Author: adri
Branch: s27_adri
Tag: (none) 
Log:

Erk; reverse merging issue.

Members: 
	src/store_update.c:1.2.4.3.4.5->1.2.4.3.4.6 

Index: squid/src/store_update.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_update.c,v
retrieving revision 1.2.4.3.4.5
retrieving revision 1.2.4.3.4.6
diff -u -r1.2.4.3.4.5 -r1.2.4.3.4.6
--- squid/src/store_update.c	22 Dec 2007 14:32:13 -0000	1.2.4.3.4.5
+++ squid/src/store_update.c	22 Dec 2007 15:11:32 -0000	1.2.4.3.4.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_update.c,v 1.2.4.3.4.5 2007/12/22 14:32:13 adri Exp $
+ * $Id: store_update.c,v 1.2.4.3.4.6 2007/12/22 15:11:32 adri Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Henrik Nordstrom <henrik@henriknordstrom.net>
@@ -90,7 +90,6 @@
 {
     const char *buf = NULL;
     StoreUpdateState *state = data;
-    assert(size <= nr.node->len - nr.offset);
 
     if (EBIT_TEST(state->newentry->flags, ENTRY_ABORTED)) {
 	debug(20, 1) ("storeUpdateCopy: Aborted at %d (%d)\n", (int) state->offset, (int) size);