From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Fri, 22 Jan 2010 01:13:11 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_2_0_1~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a90446680a8fae4388bf503c45415815ee568b8a;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 83ae9eef69..bddee51219 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -1249,17 +1249,16 @@ void Adaptation::Icap::ModXact::makeRequestHeaders(MemBuf &buf)
             virginBodySending.plan();
     }
 
-    if (TheConfig.send_client_ip && request)
-    {
+    if (TheConfig.send_client_ip && request) {
         IpAddress client_addr;
 #if FOLLOW_X_FORWARDED_FOR
-	if (TheConfig.icap_uses_indirect_client) {
-	    client_addr = request->indirect_client_addr;
-	} else
+        if (TheConfig.icap_uses_indirect_client) {
+            client_addr = request->indirect_client_addr;
+        } else
 #endif
-	client_addr = request->client_addr;
-	if(!client_addr.IsAnyAddr() && !client_addr.IsNoAddr())
-	    buf.Printf("X-Client-IP: %s\r\n", client_addr.NtoA(ntoabuf,MAX_IPSTRLEN));
+            client_addr = request->client_addr;
+        if (!client_addr.IsAnyAddr() && !client_addr.IsNoAddr())
+            buf.Printf("X-Client-IP: %s\r\n", client_addr.NtoA(ntoabuf,MAX_IPSTRLEN));
     }
 
     if (TheConfig.send_client_username && request)
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index ca57cdefaa..ad090efcae 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -399,13 +399,13 @@ ClientRequestContext::httpStateIsValid()
 
 #if FOLLOW_X_FORWARDED_FOR
 /**
- * clientFollowXForwardedForCheck() checks the content of X-Forwarded-For: 
+ * clientFollowXForwardedForCheck() checks the content of X-Forwarded-For:
  * against the followXFF ACL, or cleans up and passes control to
  * clientAccessCheck().
  *
  * The trust model here is a little ambiguous. So to clarify the logic:
  * - we may always use the direct client address as the client IP.
- * - these trust tests merey tell whether we trust given IP enough to believe the 
+ * - these trust tests merey tell whether we trust given IP enough to believe the
  *   IP string which it appended to the X-Forwarded-For: header.
  * - if at any point we don't trust what an IP adds we stop looking.
  * - at that point the current contents of indirect_client_addr are the value set