---------------------
PatchSet 3123 
Date: 2006/05/18 23:15:33
Author: hno
Branch: collapsed_forwarding
Tag: (none) 
Log:
Resolved merge conflicts

Members: 
	src/http.cc:1.35.2.4->1.35.2.5 
	src/store.cc:1.26.2.3->1.26.2.4 

Index: squid3/src/http.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -u -r1.35.2.4 -r1.35.2.5
--- squid3/src/http.cc	18 May 2006 22:35:12 -0000	1.35.2.4
+++ squid3/src/http.cc	18 May 2006 23:15:33 -0000	1.35.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.35.2.4 2006/05/18 22:35:12 hno Exp $
+ * $Id: http.cc,v 1.35.2.5 2006/05/18 23:15:33 hno Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1657,10 +1657,10 @@
 
         break;
 
-	case HDR_X_FORWARDED_FOR:
-		if (!opt_forwarded_for)
-			httpHeaderAddEntry(hdr_out, httpHeaderEntryClone(e));
-		break;
+    case HDR_X_FORWARDED_FOR:
+	if (!opt_forwarded_for)
+	    hdr_out->addEntry(e->clone());
+	break;
 
     case HDR_RANGE:
 
Index: squid3/src/store.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/store.cc,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -r1.26.2.3 -r1.26.2.4
--- squid3/src/store.cc	18 May 2006 22:35:12 -0000	1.26.2.3
+++ squid3/src/store.cc	18 May 2006 23:15:34 -0000	1.26.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.26.2.3 2006/05/18 22:35:12 hno Exp $
+ * $Id: store.cc,v 1.26.2.4 2006/05/18 23:15:34 hno Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -892,7 +892,7 @@
     assert(len >= 0);
     assert(store_status == STORE_PENDING);
 
-	mem->refresh_timestamp = squid_curtime;
+    mem_obj->refresh_timestamp = squid_curtime;
 	
     StoreIOBuffer tempBuffer;
     tempBuffer.data = (char *)buf;