---------------------
PatchSet 5575 
Date: 2003/01/01 22:40:50
Author: ymc
Branch: dtd
Tag: (none) 
Log:
added cachable to check for ProcessDTD
increment was_get instead of reseting it to 0

Members: 
	src/client_side.c:1.5.2.9.2.11.2.7->1.5.2.9.2.11.2.8 
	src/forward.c:1.4.4.1.10.5.2.3->1.4.4.1.10.5.2.4 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.5.2.9.2.11.2.7
retrieving revision 1.5.2.9.2.11.2.8
diff -u -r1.5.2.9.2.11.2.7 -r1.5.2.9.2.11.2.8
--- squid/src/client_side.c	1 Jan 2003 20:14:07 -0000	1.5.2.9.2.11.2.7
+++ squid/src/client_side.c	1 Jan 2003 22:40:50 -0000	1.5.2.9.2.11.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.5.2.9.2.11.2.7 2003/01/01 20:14:07 ymc Exp $
+ * $Id: client_side.c,v 1.5.2.9.2.11.2.8 2003/01/01 22:40:50 ymc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -3006,7 +3006,7 @@
     } else {
 	/* MISS CASE, http->log_type is already set! */
 #ifdef DTD 
-	if (http->request->method == METHOD_GET && !http->request->flags.ims && !http->request->flags.refresh && !http->request->flags.nocache) {
+	if (http->request->method == METHOD_GET && !http->request->flags.ims && !http->request->flags.refresh && !http->request->flags.nocache && http->request->flags.cachable) {
 	    http->request->flags.was_get = 1;
 	    http->request->method = METHOD_HEAD;
 	    clientProcessDTD(http);
Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.4.4.1.10.5.2.3
retrieving revision 1.4.4.1.10.5.2.4
diff -u -r1.4.4.1.10.5.2.3 -r1.4.4.1.10.5.2.4
--- squid/src/forward.c	30 Dec 2002 23:06:41 -0000	1.4.4.1.10.5.2.3
+++ squid/src/forward.c	1 Jan 2003 22:40:51 -0000	1.4.4.1.10.5.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.4.4.1.10.5.2.3 2002/12/30 23:06:41 ymc Exp $
+ * $Id: forward.c,v 1.4.4.1.10.5.2.4 2003/01/01 22:40:51 ymc Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -715,7 +715,7 @@
 #ifdef DTD
 	if (fwdState->request->flags.was_get == 1) {
 	fwdState->request->method = METHOD_GET;
-	fwdState->request->flags.was_get = 0;
+	fwdState->request->flags.was_get++;
 	}
 #endif
 	storeEntryReset(e);