From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 10 May 2008 08:56:49 +0000 (+1200)
Subject: Crop old code and temporary #ifdef
X-Git-Tag: SQUID_3_1_0_1~49^2~240^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02873aa57960b911b578aa265cd4db3bb2616eb5;p=thirdparty%2Fsquid.git

Crop old code and temporary #ifdef
---

diff --git a/src/http.cc b/src/http.cc
index b9a6950189..bdd2d80cfe 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1424,7 +1424,6 @@ HttpStateData::httpBuildRequestHeader(HttpRequest * request,
     }
 #endif
 
-#if 1 /* new code */
     strFwd = hdr_in->getList(HDR_X_FORWARDED_FOR);
 
     /** \pre Handle X-Forwarded-For */
@@ -1454,19 +1453,6 @@ HttpStateData::httpBuildRequestHeader(HttpRequest * request,
             hdr_out->putStr(HDR_X_FORWARDED_FOR, strFwd.buf());
     }
     /** If set to DELETE - do not copy through. */
-
-#else
-
-    if (opt_forwarded_for && !orig_request->client_addr.IsNoAddr()) {
-        orig_request->client_addr.NtoA(bbuf,MAX_IPSTRLEN);
-        strListAdd(&strFwd, bbuf, ',');
-    }
-    else
-        strListAdd(&strFwd, "unknown", ',');
-
-    hdr_out->putStr(HDR_X_FORWARDED_FOR, strFwd.buf());
-
-#endif
     strFwd.clean();
 
     /* append Host if not there already */