Crop old code and temporary #ifdef

diff --git a/src/http.cc b/src/http.cc
index b9a69501898a5b4a78c51ea047133951d3fd9cf6..bdd2d80cfe60d94a067f2021322223be4c423fe8 100644 (file)
--- 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 */