Reverted XFF unhiding changes

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 49c523031c0a3c84c7939bcdf18ad4276d21e9df..40005752a58e33b7ad851babd4283074f248f613 100644 (file)
--- 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 cad647411fe73b486b508e7fd572d94cab694225..747f9d3fb77e5e18e9758d22838cbd472703c675 100644 (file)
--- 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;