[packages/squid.git] / squid-2.5.STABLE7_req_resp_header.patch

Index: squid/src/acl.c
diff -c squid/src/acl.c:1.270.2.29 squid/src/acl.c:1.270.2.30
*** squid/src/acl.c:1.270.2.29	Sat Sep 25 05:56:16 2004
--- squid/src/acl.c	Wed Oct 20 17:18:36 2004
***************
*** 643,649 ****
      q = xcalloc(1, sizeof(acl_hdr_data));
      q->hdr_name = xstrdup(t);
      q->hdr_id = httpHeaderIdByNameDef(t, strlen(t));
!     aclParseRegexList(q->reglist);
      if (!q->reglist) {
  	debug(28, 0) ("%s line %d: %s\n", cfg_filename, config_lineno, config_input_line);
  	debug(28, 0) ("aclParseHeader: No pattern defined '%s'\n", t);
--- 643,649 ----
      q = xcalloc(1, sizeof(acl_hdr_data));
      q->hdr_name = xstrdup(t);
      q->hdr_id = httpHeaderIdByNameDef(t, strlen(t));
!     aclParseRegexList(&q->reglist);
      if (!q->reglist) {
  	debug(28, 0) ("%s line %d: %s\n", cfg_filename, config_lineno, config_input_line);
  	debug(28, 0) ("aclParseHeader: No pattern defined '%s'\n", t);
***************
*** 693,705 ****
  aclDumpHeader(acl_hdr_data * hd)
  {
      wordlist *W = NULL;
!     relist *data = hd->reglist;
!     wordlistAdd(&W, httpHeaderNameById(hd->hdr_id));
!     while (data != NULL) {
! 	wordlistAdd(&W, data->pattern);
! 	data = data->next;
      }
!     return aclDumpRegexList(hd->reglist);
  }
  
  #if SQUID_SNMP
--- 693,711 ----
  aclDumpHeader(acl_hdr_data * hd)
  {
      wordlist *W = NULL;
!     while (hd) {
! 	MemBuf mb;
! 	relist *data;
! 	memBufDefInit(&mb);
! 	memBufPrintf(&mb, "%s", hd->hdr_name);
! 	for (data = hd->reglist; data; data = data->next) {
! 	    memBufPrintf(&mb, " %s", data->pattern);
! 	}
! 	wordlistAdd(&W, mb.buf);
! 	memBufClean(&mb);
! 	hd = hd->next;
      }
!     return W;
  }
  
  #if SQUID_SNMP
Commit	Line	Data
c8398349	1	Index: squid/src/acl.c
	2	diff -c squid/src/acl.c:1.270.2.29 squid/src/acl.c:1.270.2.30
	3	*** squid/src/acl.c:1.270.2.29 Sat Sep 25 05:56:16 2004
	4	--- squid/src/acl.c Wed Oct 20 17:18:36 2004
	5	***************
	6	* 643,649 **
	7	q = xcalloc(1, sizeof(acl_hdr_data));
	8	q->hdr_name = xstrdup(t);
	9	q->hdr_id = httpHeaderIdByNameDef(t, strlen(t));
	10	! aclParseRegexList(q->reglist);
	11	if (!q->reglist) {
	12	debug(28, 0) ("%s line %d: %s\n", cfg_filename, config_lineno, config_input_line);
	13	debug(28, 0) ("aclParseHeader: No pattern defined '%s'\n", t);
	14	--- 643,649 ----
	15	q = xcalloc(1, sizeof(acl_hdr_data));
	16	q->hdr_name = xstrdup(t);
	17	q->hdr_id = httpHeaderIdByNameDef(t, strlen(t));
	18	! aclParseRegexList(&q->reglist);
	19	if (!q->reglist) {
	20	debug(28, 0) ("%s line %d: %s\n", cfg_filename, config_lineno, config_input_line);
	21	debug(28, 0) ("aclParseHeader: No pattern defined '%s'\n", t);
	22	***************
	23	* 693,705 **
	24	aclDumpHeader(acl_hdr_data * hd)
	25	{
	26	wordlist *W = NULL;
	27	! relist *data = hd->reglist;
	28	! wordlistAdd(&W, httpHeaderNameById(hd->hdr_id));
	29	! while (data != NULL) {
	30	! wordlistAdd(&W, data->pattern);
	31	! data = data->next;
	32	}
	33	! return aclDumpRegexList(hd->reglist);
	34	}
	35
	36	#if SQUID_SNMP
	37	--- 693,711 ----
	38	aclDumpHeader(acl_hdr_data * hd)
	39	{
	40	wordlist *W = NULL;
	41	! while (hd) {
	42	! MemBuf mb;
	43	! relist *data;
	44	! memBufDefInit(&mb);
	45	! memBufPrintf(&mb, "%s", hd->hdr_name);
	46	! for (data = hd->reglist; data; data = data->next) {
	47	! memBufPrintf(&mb, " %s", data->pattern);
	48	! }
	49	! wordlistAdd(&W, mb.buf);
	50	! memBufClean(&mb);
	51	! hd = hd->next;
	52	}
	53	! return W;
	54	}
	55
	56	#if SQUID_SNMP