From: wessels <>
Date: Sat, 5 Nov 2005 03:27:31 +0000 (+0000)
Subject: Rename the "mangle_headers" optimization to "mangle_request_headers"
X-Git-Tag: SQUID_3_0_PRE4~549
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f56514c2059eb999b9f9d87e4d234beb69c1b18;p=thirdparty%2Fsquid.git

Rename the "mangle_headers" optimization to "mangle_request_headers"
so that we can do the same for reply header mangling later on.
---

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 4b7fd89505..a90c22838f 100644
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeaderTools.cc,v 1.51 2005/11/04 20:23:18 wessels Exp $
+ * $Id: HttpHeaderTools.cc,v 1.52 2005/11/04 20:27:31 wessels Exp $
  *
  * DEBUG: section 66    HTTP Header Tools
  * AUTHOR: Alex Rousskov
@@ -561,7 +561,7 @@ httpHdrMangleList(HttpHeader * l, HttpRequest * request, int req_or_rep)
  * for optimization during request forwarding.
  */
 int
-httpHdrManglersConfigured()
+httpReqHdrManglersConfigured()
 {
     for (int i = 0; i < HDR_ENUM_END; i++) {
         if (NULL != Config.request_header_access[i].access_list)
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index ce240fc2bd..6ba72a8067 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.484 2005/11/04 20:23:18 wessels Exp $
+ * $Id: cache_cf.cc,v 1.485 2005/11/04 20:27:31 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -601,7 +601,7 @@ configDoConfigure(void)
     if (aclPurgeMethodInUse(Config.accessList.http))
         Config2.onoff.enable_purge = 1;
 
-    Config2.onoff.mangle_headers = httpHdrManglersConfigured();
+    Config2.onoff.mangle_request_headers = httpReqHdrManglersConfigured();
 
     if (geteuid() == 0) {
         if (NULL != Config.effectiveUser) {
diff --git a/src/http.cc b/src/http.cc
index 946b212e71..5e5715d9c7 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.463 2005/11/04 20:23:18 wessels Exp $
+ * $Id: http.cc,v 1.464 2005/11/04 20:27:31 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1448,7 +1448,7 @@ httpBuildRequestHeader(HttpRequest * request,
     }
 
     /* Now mangle the headers. */
-    if (Config2.onoff.mangle_headers)
+    if (Config2.onoff.mangle_request_headers)
         httpHdrMangleList(hdr_out, request, ROR_REQUEST);
 
     strConnection.clean();
diff --git a/src/protos.h b/src/protos.h
index c3322ddfc5..0506ff2afd 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.512 2005/11/04 20:23:18 wessels Exp $
+ * $Id: protos.h,v 1.513 2005/11/04 20:27:31 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -432,7 +432,7 @@ SQUIDCEXTERN void httpHeaderEntryPackInto(const HttpHeaderEntry * e, Packer * p)
 /* store report about current header usage and other stats */
 SQUIDCEXTERN void httpHeaderStoreReport(StoreEntry * e);
 SQUIDCEXTERN void httpHdrMangleList(HttpHeader *, HttpRequest *, int req_or_rep);
-SQUIDCEXTERN int httpHdrManglersConfigured();
+SQUIDCEXTERN int httpReqHdrManglersConfigured();
 
 SQUIDCEXTERN void icmpOpen(void);
 SQUIDCEXTERN void icmpClose(void);
diff --git a/src/structs.h b/src/structs.h
index dc228e369c..12382b7704 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.530 2005/11/04 20:23:18 wessels Exp $
+ * $Id: structs.h,v 1.531 2005/11/04 20:27:31 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -762,7 +762,7 @@ struct _SquidConfig2
     struct
     {
         int enable_purge;
-        int mangle_headers;
+        int mangle_request_headers;
     }
 
     onoff;