---------------------
PatchSet 10299 
Date: 2007/12/22 14:38:58
Author: adri
Branch: s27_adri
Tag: (none) 
Log:
Fix merging issues.

Members: 
	src/client_side.c:1.202.2.9.4.20->1.202.2.9.4.21 
	src/http.c:1.63.2.3.4.18->1.63.2.3.4.19 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.202.2.9.4.20
retrieving revision 1.202.2.9.4.21
diff -u -r1.202.2.9.4.20 -r1.202.2.9.4.21
--- squid/src/client_side.c	22 Dec 2007 14:32:11 -0000	1.202.2.9.4.20
+++ squid/src/client_side.c	22 Dec 2007 14:38:58 -0000	1.202.2.9.4.21
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.202.2.9.4.20 2007/12/22 14:32:11 adri Exp $
+ * $Id: client_side.c,v 1.202.2.9.4.21 2007/12/22 14:38:58 adri Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -5038,7 +5038,7 @@
 	/* virtual "vary" object found. Calculate the vary key and
 	 * continue the search
 	 */
-	if (httpMakeVaryMark(request, entry->mem_obj->reply) {
+	if (httpMakeVaryMark(request, entry->mem_obj->reply)) {
 	    /* Save the vary_id for the second time through. */
 	    request->vary_id = entry->mem_obj->vary_id;
 	    return VARY_OTHER;
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.63.2.3.4.18
retrieving revision 1.63.2.3.4.19
diff -u -r1.63.2.3.4.18 -r1.63.2.3.4.19
--- squid/src/http.c	22 Dec 2007 14:32:11 -0000	1.63.2.3.4.18
+++ squid/src/http.c	22 Dec 2007 14:38:58 -0000	1.63.2.3.4.19
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.63.2.3.4.18 2007/12/22 14:32:11 adri Exp $
+ * $Id: http.c,v 1.63.2.3.4.19 2007/12/22 14:38:58 adri Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1226,12 +1226,13 @@
     /* append Via */
     if (Config.onoff.via) {
 	String strVia = httpHeaderGetList(hdr_in, HDR_VIA);
-	snprintf(bbuf, BBUF_SZ, "%d.%d %s",
+        int len;
+	len = snprintf(bbuf, BBUF_SZ, "%d.%d %s",
 	    orig_request->http_ver.major,
 	    orig_request->http_ver.minor, ThisCache);
-	strListAdd(&strVia, bbuf, ',');
+	strListAdd(&strVia, bbuf, len, ',');
 	if (flags.http11)
-	    strListAdd(&strVia, "1.0 internal", ',');
+	    strListAdd(&strVia, "1.0 internal", 12, ',');
 	httpHeaderPutString(hdr_out, HDR_VIA, strVia);
 	stringClean(&strVia);
     }