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 4b7fd895050068becae2048b3060c4044dee43d5..a90c22838f45c09df03c679fc26149c46272fee1 100644 (file)
--- 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 ce240fc2bd7d3e86f8a2b490587b11cfa71e8dc3..6ba72a80670c6b4e1be2abd042b2fc0f5d8c1ac0 100644 (file)
--- 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 946b212e712c075c51087516da2f7568a9ec6f43..5e5715d9c7c5406ba0efce4198204c4bea34747b 100644 (file)
--- 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 c3322ddfc5b2384723fd586a98c2d882d53c4e86..0506ff2afd2684f0acca65948b278f7aab1d2d6c 100644 (file)
--- 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 dc228e369c9c9ab5ac546851cae20af414c1792d..12382b7704a105971dc481dd166913e15506e27f 100644 (file)
--- 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;