Partially reverted XFF preprocessor conditional code.

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index db5200c060496c84234c89604ad507b6ac167344..5cc8ad6961bd4dfbe49be8b01fcb7e931d1cb54d 100644 (file)
--- 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);