---------------------
PatchSet 5545 
Date: 2002/12/09 01:06:49
Author: ymc
Branch: dsa
Tag: (none) 
Log:
take care of ENTRY_FWD_HDR_WAIT, ENTRY_NEGCACHED

Members: 
	src/forward.c:1.4.4.1.10.3->1.4.4.1.10.4 
	src/store.c:1.4.4.5.6.10->1.4.4.5.6.11 

Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.4.4.1.10.3
retrieving revision 1.4.4.1.10.4
diff -u -r1.4.4.1.10.3 -r1.4.4.1.10.4
--- squid/src/forward.c	9 Dec 2002 00:52:35 -0000	1.4.4.1.10.3
+++ squid/src/forward.c	9 Dec 2002 01:06:49 -0000	1.4.4.1.10.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.4.4.1.10.3 2002/12/09 00:52:35 ymc Exp $
+ * $Id: forward.c,v 1.4.4.1.10.4 2002/12/09 01:06:49 ymc Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -634,7 +634,11 @@
 void
 fwdFail(FwdState * fwdState, ErrorState * errorState)
 {
+#ifdef DSA
+    assert(EBIT_TEST(fwdState->entry->p->flags, ENTRY_FWD_HDR_WAIT));
+#else
     assert(EBIT_TEST(fwdState->entry->flags, ENTRY_FWD_HDR_WAIT));
+#endif
     debug(17, 3) ("fwdFail: %s \"%s\"\n\t%s\n",
 	err_type_str[errorState->type],
 	httpStatusString(errorState->http_status),
Index: squid/src/store.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store.c,v
retrieving revision 1.4.4.5.6.10
retrieving revision 1.4.4.5.6.11
diff -u -r1.4.4.5.6.10 -r1.4.4.5.6.11
--- squid/src/store.c	9 Dec 2002 00:52:35 -0000	1.4.4.5.6.10
+++ squid/src/store.c	9 Dec 2002 01:06:50 -0000	1.4.4.5.6.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.c,v 1.4.4.5.6.10 2002/12/09 00:52:35 ymc Exp $
+ * $Id: store.c,v 1.4.4.5.6.11 2002/12/09 01:06:50 ymc Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -971,7 +971,11 @@
     } else if (e->store_status == STORE_OK && EBIT_TEST(e->flags, ENTRY_BAD_LENGTH)) {
 	debug(20, 2) ("storeCheckCachable: NO: wrong content-length\n");
 	store_check_cachable_hist.no.wrong_content_length++;
+#ifdef DSA
+    } else if (EBIT_TEST(e->mem_obj->e->flags, ENTRY_NEGCACHED)) {
+#else
     } else if (EBIT_TEST(e->flags, ENTRY_NEGCACHED)) {
+#endif
 	debug(20, 3) ("storeCheckCachable: NO: negative cached\n");
 	store_check_cachable_hist.no.negative_cached++;
 	return 0;		/* avoid release call below */