---------------------
PatchSet 8784 
Date: 2006/11/30 13:04:39
Author: adri
Branch: parserwork
Tag: (none) 
Log:
Fix merging issue.

Members: 
	src/HttpHeader.c:1.23.4.2->1.23.4.3 

Index: squid/src/HttpHeader.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHeader.c,v
retrieving revision 1.23.4.2
retrieving revision 1.23.4.3
diff -u -r1.23.4.2 -r1.23.4.3
--- squid/src/HttpHeader.c	31 Aug 2006 06:03:34 -0000	1.23.4.2
+++ squid/src/HttpHeader.c	30 Nov 2006 13:04:39 -0000	1.23.4.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.c,v 1.23.4.2 2006/08/31 06:03:34 adri Exp $
+ * $Id: HttpHeader.c,v 1.23.4.3 2006/11/30 13:04:39 adri Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -343,10 +343,8 @@
      * has been used.  As a hack, just never count zero-sized header
      * arrays.
      */
-#if 0
     if (0 != hdr->entries.count)
 	statHistCount(&HttpHeaderStats[hdr->owner].hdrUCountDistr, hdr->entries.count);
-#endif
     HttpHeaderStats[hdr->owner].destroyedCount++;
     HttpHeaderStats[hdr->owner].busyDestroyedCount += hdr->entries.count > 0;
     while ((e = httpHeaderGetEntry(hdr, &pos))) {
@@ -355,9 +353,7 @@
 	    debug(55, 0) ("httpHeaderClean BUG: entry[%d] is invalid (%d). Ignored.\n",
 		(int) pos, e->id);
 	} else {
-#if 0
 	    statHistCount(&HttpHeaderStats[hdr->owner].fieldTypeDistr, e->id);
-#endif
 	    /* yes, this destroy() leaves us in an inconsistent state */
 	    httpHeaderEntryDestroy(e);
 	}