From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 14 Sep 2012 11:50:29 +0000 (+0200)
Subject: Partially reverted XFF preprocessor conditional code.
X-Git-Tag: sourceformat-review-1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbe9e3796d93c977edc21cb77ad0c879acbb5b8e;p=thirdparty%2Fsquid.git

Partially reverted XFF preprocessor conditional code.
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index db5200c060..5cc8ad6961 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -710,9 +710,8 @@ ClientRequestContext::hostHeaderVerify()
 void
 ClientRequestContext::clientAccessCheck()
 {
-    /* NOP if !FOLLOW_X_FORWARDED_FOR */
-    if (FOLLOW_X_FORWARDED_FOR &&
-            !http->request->flags.doneFollowXFF() &&
+#if FOLLOW_X_FORWARDED_FOR
+    if (!http->request->flags.doneFollowXFF() &&
             Config.accessList.followXFF &&
             http->request->header.has(HDR_X_FORWARDED_FOR)) {
 
@@ -728,6 +727,7 @@ ClientRequestContext::clientAccessCheck()
         acl_checklist->nonBlockingCheck(clientFollowXForwardedForCheck, this);
         return;
     }
+#endif
 
     if (Config.accessList.http) {
         acl_checklist = clientAclChecklistCreate(Config.accessList.http, http);