From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 14 Sep 2012 11:35:12 +0000 (+0200)
Subject: Reverted XFF unhiding changes
X-Git-Tag: sourceformat-review-1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b24cf01e6b5a0cba6d948573f3c18e48cf38bf;p=thirdparty%2Fsquid.git

Reverted XFF unhiding changes
---

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 49c523031c..40005752a5 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -173,7 +173,9 @@ public:
 
     Ip::Address client_addr;
 
+#if FOLLOW_X_FORWARDED_FOR
     Ip::Address indirect_client_addr;
+#endif /* FOLLOW_X_FORWARDED_FOR */
 
     Ip::Address my_addr;
 
@@ -206,7 +208,9 @@ public:
 
     String extacl_message;	/* String to be used for error page purposes */
 
+#if FOLLOW_X_FORWARDED_FOR
     String x_forwarded_for_iterator; /* XXX a list of IP addresses */
+#endif /* FOLLOW_X_FORWARDED_FOR */
 
 public:
     bool multipartRangeRequest() const;
diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index cad647411f..747f9d3fb7 100644
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -383,7 +383,9 @@ public:
 #if USE_SSL
         acl_access *ssl_bump;
 #endif
+#if FOLLOW_X_FORWARDED_FOR
         acl_access *followXFF;
+#endif /* FOLLOW_X_FORWARDED_FOR */
 
 #if ICAP_CLIENT
         acl_access* icap;